Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0042d5e authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: qgroup: Drop fs_info parameter from btrfs_limit_qgroup 



It can be fetched from the transaction handle.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3efbee1d

fs/btrfs/ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -5245,7 +5245,6 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg) 
static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg)

{

	struct inode *inode = file_inode(file);

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct btrfs_ioctl_qgroup_limit_args *sa;

	struct btrfs_trans_handle *trans;
@@ -5278,7 +5277,7 @@ static long btrfs_ioctl_qgroup_limit(struct file *file, void __user *arg) 
		qgroupid = root->root_key.objectid;

	}



	ret = btrfs_limit_qgroup(trans, fs_info, qgroupid, &sa->lim);

	ret = btrfs_limit_qgroup(trans, qgroupid, &sa->lim);



	err = btrfs_end_transaction(trans);

	if (err && !ret)

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -1445,10 +1445,10 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid) 
	return ret;

}



int btrfs_limit_qgroup(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 qgroupid,

int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid,

		       struct btrfs_qgroup_limit *limit)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root;

	struct btrfs_qgroup *qgroup;

	int ret = 0;

fs/btrfs/qgroup.h

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, 
			      u64 dst);

int btrfs_create_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid);

int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid);

int btrfs_limit_qgroup(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 qgroupid,

int btrfs_limit_qgroup(struct btrfs_trans_handle *trans, u64 qgroupid,

		       struct btrfs_qgroup_limit *limit);

int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info);

void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info);