Linux Btrfs filesystem development
 help / color / mirror / Atom feed
From: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Subject: [PATCH 08/19] btrfs: qgroup: Drop fs_info parameter from __del_qgroup_relation
Date: Wed, 18 Jul 2018 14:45:31 +0800	[thread overview]
Message-ID: <20180718064542.2730-9-lufq.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20180718064542.2730-1-lufq.fnst@cn.fujitsu.com>

It can be fetched from the transaction handle.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
 fs/btrfs/qgroup.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 9e709a01bfaa..51e43dbedbbc 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1299,9 +1299,10 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
 	return ret;
 }
 
-static int __del_qgroup_relation(struct btrfs_trans_handle *trans,
-			      struct btrfs_fs_info *fs_info, u64 src, u64 dst)
+static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
+				 u64 dst)
 {
+	struct btrfs_fs_info *fs_info = trans->fs_info;
 	struct btrfs_root *quota_root;
 	struct btrfs_qgroup *parent;
 	struct btrfs_qgroup *member;
@@ -1355,7 +1356,7 @@ int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,
 	int ret = 0;
 
 	mutex_lock(&fs_info->qgroup_ioctl_lock);
-	ret = __del_qgroup_relation(trans, fs_info, src, dst);
+	ret = __del_qgroup_relation(trans, src, dst);
 	mutex_unlock(&fs_info->qgroup_ioctl_lock);
 
 	return ret;
@@ -1428,9 +1429,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,
 	while (!list_empty(&qgroup->groups)) {
 		list = list_first_entry(&qgroup->groups,
 					struct btrfs_qgroup_list, next_group);
-		ret = __del_qgroup_relation(trans, fs_info,
-					   qgroupid,
-					   list->group->qgroupid);
+		ret = __del_qgroup_relation(trans, qgroupid,
+					    list->group->qgroupid);
 		if (ret)
 			goto out;
 	}
-- 
2.18.0




  parent reply	other threads:[~2018-07-18  7:22 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-18  6:45 [PATCH 00/19] qgroup unused parameter cleanup Lu Fengqi
2018-07-18  6:45 ` [PATCH 01/19] btrfs: qgroup: Drop quota_root parameter from add_qgroup_relation_item Lu Fengqi
2018-07-18  6:45 ` [PATCH 02/19] btrfs: qgroup: Drop quota_root parameter from del_qgroup_relation_item Lu Fengqi
2018-07-18  6:45 ` [PATCH 03/19] btrfs: qgroup: Drop quota_root parameter from del_qgroup_item Lu Fengqi
2018-07-18  6:45 ` [PATCH 04/19] btrfs: qgroup: Drop root parameter from update_qgroup_limit_item Lu Fengqi
2018-07-18  6:45 ` [PATCH 05/19] btrfs: qgroup: Drop root parameter from update_qgroup_info_item Lu Fengqi
2018-07-18  6:45 ` [PATCH 06/19] btrfs: qgroup: Drop quota_root and fs_info parameters from update_qgroup_status_item Lu Fengqi
2018-07-18  6:45 ` [PATCH 07/19] btrfs: qgroup: Drop fs_info parameter from btrfs_add_qgroup_relation Lu Fengqi
2018-07-18  6:45 ` Lu Fengqi [this message]
2018-07-18  6:45 ` [PATCH 09/19] btrfs: qgroup: Drop fs_info parameter from btrfs_del_qgroup_relation Lu Fengqi
2018-07-18  6:45 ` [PATCH 10/19] btrfs: qgroup: Drop fs_info parameter from btrfs_create_qgroup Lu Fengqi
2018-07-18  6:45 ` [PATCH 11/19] btrfs: qgroup: Drop fs_info parameter from btrfs_remove_qgroup Lu Fengqi
2018-07-18  6:45 ` [PATCH 12/19] btrfs: qgroup: Drop fs_info parameter from btrfs_limit_qgroup Lu Fengqi
2018-07-18  6:45 ` [PATCH 13/19] btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_trace_extent Lu Fengqi
2018-07-18  6:58   ` Qu Wenruo
2018-07-18  7:54     ` Lu Fengqi
2018-07-18  8:02       ` Qu Wenruo
2018-07-18  8:28   ` [PATCH v2 " Lu Fengqi
2018-07-18  6:45 ` [PATCH 14/19] btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_trace_leaf_items Lu Fengqi
2018-07-18  6:45 ` [PATCH 15/19] btrfs: qgroup: Drop root parameter from btrfs_qgroup_trace_subtree Lu Fengqi
2018-07-18  6:45 ` [PATCH 16/19] btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_account_extent Lu Fengqi
2018-07-18  6:45 ` [PATCH 17/19] btrfs: qgroup: Drop fs_info parameter from btrfs_run_qgroups Lu Fengqi
2018-07-18  6:45 ` [PATCH 18/19] btrfs: qgroup: Drop fs_info parameter from btrfs_qgroup_inherit Lu Fengqi
2018-07-18  6:45 ` [PATCH 19/19] btrfs: qgroup: Drop fs_info parameter from qgroup_rescan_leaf Lu Fengqi
2018-07-18  7:00 ` [PATCH 00/19] qgroup unused parameter cleanup Qu Wenruo
2018-07-18 13:36 ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180718064542.2730-9-lufq.fnst@cn.fujitsu.com \
    --to=lufq.fnst@cn.fujitsu.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox