Commit 1f73cb4d authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Add warn param to subvol_get_snapshot, peek_inode 



These shouldn't always be fatal errors - logged op resume, in
particular, and we want it as a parameter there.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 72350ee0

fs/bcachefs/inode.c

+11 −21
Original line number Diff line number Diff line
@@ -327,20 +327,18 @@ int bch2_inode_unpack(struct bkey_s_c k, 
		: bch2_inode_unpack_slowpath(k, unpacked);

}



int bch2_inode_peek_nowarn(struct btree_trans *trans,

int __bch2_inode_peek(struct btree_trans *trans,

		      struct btree_iter *iter,

		      struct bch_inode_unpacked *inode,

		    subvol_inum inum, unsigned flags)

		      subvol_inum inum, unsigned flags,

		      bool warn)

{

	struct bkey_s_c k;

	u32 snapshot;

	int ret;



	ret = bch2_subvolume_get_snapshot(trans, inum.subvol, &snapshot);

	int ret = __bch2_subvolume_get_snapshot(trans, inum.subvol, &snapshot, warn);

	if (ret)

		return ret;



	k = bch2_bkey_get_iter(trans, iter, BTREE_ID_inodes,

	struct bkey_s_c k = bch2_bkey_get_iter(trans, iter, BTREE_ID_inodes,

					       SPOS(0, inum.inum, snapshot),

					       flags|BTREE_ITER_cached);

	ret = bkey_err(k);
@@ -357,17 +355,9 @@ int bch2_inode_peek_nowarn(struct btree_trans *trans, 


	return 0;

err:

	bch2_trans_iter_exit(trans, iter);

	return ret;

}



int bch2_inode_peek(struct btree_trans *trans,

		    struct btree_iter *iter,

		    struct bch_inode_unpacked *inode,

		    subvol_inum inum, unsigned flags)

{

	int ret = bch2_inode_peek_nowarn(trans, iter, inode, inum, flags);

	if (warn)

		bch_err_msg(trans->c, ret, "looking up inum %llu:%llu:", inum.subvol, inum.inum);

	bch2_trans_iter_exit(trans, iter);

	return ret;

}

fs/bcachefs/inode.h

+20 −4
Original line number Diff line number Diff line
@@ -97,10 +97,26 @@ struct bkey_i *bch2_inode_to_v3(struct btree_trans *, struct bkey_i *); 


void bch2_inode_unpacked_to_text(struct printbuf *, struct bch_inode_unpacked *);



int bch2_inode_peek_nowarn(struct btree_trans *, struct btree_iter *,

		    struct bch_inode_unpacked *, subvol_inum, unsigned);

int bch2_inode_peek(struct btree_trans *, struct btree_iter *,

		    struct bch_inode_unpacked *, subvol_inum, unsigned);

int __bch2_inode_peek(struct btree_trans *, struct btree_iter *,

		      struct bch_inode_unpacked *, subvol_inum, unsigned, bool);



static inline int bch2_inode_peek_nowarn(struct btree_trans *trans,

					 struct btree_iter *iter,

					 struct bch_inode_unpacked *inode,

					 subvol_inum inum, unsigned flags)

{

	return __bch2_inode_peek(trans, iter, inode, inum, flags, false);

}



static inline int bch2_inode_peek(struct btree_trans *trans,

				  struct btree_iter *iter,

				  struct bch_inode_unpacked *inode,

				  subvol_inum inum, unsigned flags)

{

	return __bch2_inode_peek(trans, iter, inode, inum, flags, true);

	int ret = bch2_inode_peek_nowarn(trans, iter, inode, inum, flags);

	return ret;

}



int bch2_inode_write_flags(struct btree_trans *, struct btree_iter *,

		     struct bch_inode_unpacked *, enum btree_iter_update_trigger_flags);

fs/bcachefs/subvolume.c

+10 −3
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ int bch2_snapshot_get_subvol(struct btree_trans *trans, u32 snapshot, 
		bch2_subvolume_get(trans, le32_to_cpu(snap.subvol), true, 0, subvol);

}



int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,

				u32 *snapid)

int __bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,

				  u32 *snapid, bool warn)

{

	struct btree_iter iter;

	struct bkey_s_c_subvolume subvol;
@@ -344,7 +344,8 @@ int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid, 
					  BTREE_ITER_cached|BTREE_ITER_with_updates,

					  subvolume);

	ret = bkey_err(subvol);

	bch2_fs_inconsistent_on(bch2_err_matches(ret, ENOENT), trans->c,



	bch2_fs_inconsistent_on(warn && bch2_err_matches(ret, ENOENT), trans->c,

				"missing subvolume %u", subvolid);



	if (likely(!ret))
@@ -353,6 +354,12 @@ int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid, 
	return ret;

}



int bch2_subvolume_get_snapshot(struct btree_trans *trans, u32 subvolid,

				u32 *snapid)

{

	return __bch2_subvolume_get_snapshot(trans, subvolid, snapid, true);

}



static int bch2_subvolume_reparent(struct btree_trans *trans,

				   struct btree_iter *iter,

				   struct bkey_s_c k,

fs/bcachefs/subvolume.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ int bch2_subvolume_trigger(struct btree_trans *, enum btree_id, unsigned, 
int bch2_subvol_has_children(struct btree_trans *, u32);

int bch2_subvolume_get(struct btree_trans *, unsigned,

		       bool, int, struct bch_subvolume *);

int __bch2_subvolume_get_snapshot(struct btree_trans *, u32,

				  u32 *, bool);

int bch2_subvolume_get_snapshot(struct btree_trans *, u32, u32 *);



int bch2_subvol_is_ro_trans(struct btree_trans *, u32);