Commit 08d50ca3 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Remove fs_info argument from create_pending_snapshots/create_pending_snapshot

We already pass the trans handle which has a reference to fs_info to
create_pending_snapshot so we can refer to it directly. Doing this
obviates the need to pass the fs_info to create_pending_snapshots as
well. No functional changes.
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 16916a88
...@@ -1436,9 +1436,10 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, ...@@ -1436,9 +1436,10 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
* the creation of the pending snapshots, just return 0. * the creation of the pending snapshots, just return 0.
*/ */
static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info,
struct btrfs_pending_snapshot *pending) struct btrfs_pending_snapshot *pending)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_root_item *new_root_item; struct btrfs_root_item *new_root_item;
struct btrfs_root *tree_root = fs_info->tree_root; struct btrfs_root *tree_root = fs_info->tree_root;
...@@ -1705,8 +1706,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, ...@@ -1705,8 +1706,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
/* /*
* create all the snapshots we've scheduled for creation * create all the snapshots we've scheduled for creation
*/ */
static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans, static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans)
struct btrfs_fs_info *fs_info)
{ {
struct btrfs_pending_snapshot *pending, *next; struct btrfs_pending_snapshot *pending, *next;
struct list_head *head = &trans->transaction->pending_snapshots; struct list_head *head = &trans->transaction->pending_snapshots;
...@@ -1714,7 +1714,7 @@ static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans, ...@@ -1714,7 +1714,7 @@ static noinline int create_pending_snapshots(struct btrfs_trans_handle *trans,
list_for_each_entry_safe(pending, next, head, list) { list_for_each_entry_safe(pending, next, head, list) {
list_del(&pending->list); list_del(&pending->list);
ret = create_pending_snapshot(trans, fs_info, pending); ret = create_pending_snapshot(trans, pending);
if (ret) if (ret)
break; break;
} }
...@@ -2111,7 +2111,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) ...@@ -2111,7 +2111,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
* deal with them in create_pending_snapshot(), which is the * deal with them in create_pending_snapshot(), which is the
* core function of the snapshot creation. * core function of the snapshot creation.
*/ */
ret = create_pending_snapshots(trans, fs_info); ret = create_pending_snapshots(trans);
if (ret) { if (ret) {
mutex_unlock(&fs_info->reloc_mutex); mutex_unlock(&fs_info->reloc_mutex);
goto scrub_continue; goto scrub_continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment