Commit ce701571 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: kill flags param to bch2_subvolume_get() 



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

fs/bcachefs/dirent.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ int bch2_dirent_read_target(struct btree_trans *trans, subvol_inum dir, 
	} else {

		target->subvol	= le32_to_cpu(d.v->d_child_subvol);



		ret = bch2_subvolume_get(trans, target->subvol, true, BTREE_ITER_cached, &s);

		ret = bch2_subvolume_get(trans, target->subvol, true, &s);



		target->inum	= le64_to_cpu(s.inode);

	}

fs/bcachefs/fs-common.c

+1 −3
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ int bch2_create_trans(struct btree_trans *trans, 
		if (!snapshot_src.inum) {

			/* Inode wasn't specified, just snapshot: */

			struct bch_subvolume s;



			ret = bch2_subvolume_get(trans, snapshot_src.subvol, true,

						 BTREE_ITER_cached, &s);

			ret = bch2_subvolume_get(trans, snapshot_src.subvol, true, &s);

			if (ret)

				goto err;

fs/bcachefs/fs.c

+3 −4
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ struct inode *bch2_vfs_inode_get(struct bch_fs *c, subvol_inum inum) 
	struct bch_inode_unpacked inode_u;

	struct bch_subvolume subvol;

	int ret = lockrestart_do(trans,

		bch2_subvolume_get(trans, inum.subvol, true, 0, &subvol) ?:

		bch2_subvolume_get(trans, inum.subvol, true, &subvol) ?:

		bch2_inode_find_by_inum_trans(trans, inum, &inode_u)) ?:

		PTR_ERR_OR_ZERO(inode = bch2_inode_hash_init_insert(trans, inum, &inode_u, &subvol));

	bch2_trans_put(trans);
@@ -569,8 +569,7 @@ __bch2_create(struct mnt_idmap *idmap, 
	inum.subvol = inode_u.bi_subvol ?: dir->ei_inum.subvol;

	inum.inum = inode_u.bi_inum;



	ret   = bch2_subvolume_get(trans, inum.subvol, true,

				   BTREE_ITER_with_updates, &subvol) ?:

	ret   = bch2_subvolume_get(trans, inum.subvol, true, &subvol) ?:

		bch2_trans_commit(trans, NULL, &journal_seq, 0);

	if (unlikely(ret)) {

		bch2_quota_acct(c, bch_qid(&inode_u), Q_INO, -1,
@@ -651,7 +650,7 @@ static struct bch_inode_info *bch2_lookup_trans(struct btree_trans *trans, 


	struct bch_subvolume subvol;

	struct bch_inode_unpacked inode_u;

	ret =   bch2_subvolume_get(trans, inum.subvol, true, 0, &subvol) ?:

	ret =   bch2_subvolume_get(trans, inum.subvol, true, &subvol) ?:

		bch2_inode_find_by_inum_nowarn_trans(trans, inum, &inode_u) ?:

		PTR_ERR_OR_ZERO(inode = bch2_inode_hash_init_insert(trans, inum, &inode_u, &subvol));

fs/bcachefs/fsck.c

+3 −4
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int subvol_lookup(struct btree_trans *trans, u32 subvol, 
			 u32 *snapshot, u64 *inum)

{

	struct bch_subvolume s;

	int ret = bch2_subvolume_get(trans, subvol, false, 0, &s);

	int ret = bch2_subvolume_get(trans, subvol, false, &s);



	*snapshot = le32_to_cpu(s.snapshot);

	*inum = le64_to_cpu(s.inode);
@@ -226,8 +226,7 @@ static int lookup_lostfound(struct btree_trans *trans, u32 snapshot, 
	subvol_inum root_inum = { .subvol = le32_to_cpu(st.master_subvol) };



	struct bch_subvolume subvol;

	ret = bch2_subvolume_get(trans, le32_to_cpu(st.master_subvol),

				 false, 0, &subvol);

	ret = bch2_subvolume_get(trans, le32_to_cpu(st.master_subvol), false, &subvol);

	bch_err_msg(c, ret, "looking up root subvol %u for snapshot %u",

		    le32_to_cpu(st.master_subvol), snapshot);

	if (ret)
@@ -1421,7 +1420,7 @@ static int check_inode(struct btree_trans *trans, 
	if (u.bi_subvol) {

		struct bch_subvolume s;



		ret = bch2_subvolume_get(trans, u.bi_subvol, false, 0, &s);

		ret = bch2_subvolume_get(trans, u.bi_subvol, false, &s);

		if (ret && !bch2_err_matches(ret, ENOENT))

			goto err;

fs/bcachefs/snapshot.c

+2 −3
Original line number Diff line number Diff line
@@ -570,8 +570,7 @@ static int check_snapshot_tree(struct btree_trans *trans, 
		goto err;

	}



	ret = bch2_subvolume_get(trans, le32_to_cpu(st.v->master_subvol),

				 false, 0, &subvol);

	ret = bch2_subvolume_get(trans, le32_to_cpu(st.v->master_subvol), false, &subvol);

	if (ret && !bch2_err_matches(ret, ENOENT))

		goto err;
@@ -811,7 +810,7 @@ static int check_snapshot(struct btree_trans *trans, 


	if (should_have_subvol) {

		id = le32_to_cpu(s.subvol);

		ret = bch2_subvolume_get(trans, id, 0, false, &subvol);

		ret = bch2_subvolume_get(trans, id, false, &subvol);

		if (bch2_err_matches(ret, ENOENT))

			bch_err(c, "snapshot points to nonexistent subvolume:\n  %s",

				(bch2_bkey_val_to_text(&buf, c, k), buf.buf));