Commit 33c44184 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: pass btrfs_fs_info for deleting snapshots and cleaner 



We're passing a root around here, but we only really need the fs_info,
so fix up btrfs_clean_one_deleted_snapshot() to take an fs_info instead,
and then fix up all the callers appropriately.

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c067da87

fs/btrfs/disk-io.c

+3 −4
Original line number Diff line number Diff line
@@ -1947,8 +1947,7 @@ static void end_workqueue_fn(struct btrfs_work *work) 


static int cleaner_kthread(void *arg)

{

	struct btrfs_root *root = arg;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_fs_info *fs_info = (struct btrfs_fs_info *)arg;

	int again;



	while (1) {
@@ -1981,7 +1980,7 @@ static int cleaner_kthread(void *arg) 


		btrfs_run_delayed_iputs(fs_info);



		again = btrfs_clean_one_deleted_snapshot(root);

		again = btrfs_clean_one_deleted_snapshot(fs_info);

		mutex_unlock(&fs_info->cleaner_mutex);



		/*
@@ -3806,7 +3805,7 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
		goto fail_sysfs;

	}



	fs_info->cleaner_kthread = kthread_run(cleaner_kthread, tree_root,

	fs_info->cleaner_kthread = kthread_run(cleaner_kthread, fs_info,

					       "btrfs-cleaner");

	if (IS_ERR(fs_info->cleaner_kthread))

		goto fail_sysfs;

fs/btrfs/transaction.c

+2 −2
Original line number Diff line number Diff line
@@ -2505,10 +2505,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 
 * because btrfs_commit_super will poke cleaner thread and it will process it a

 * few seconds later.

 */

int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)

int btrfs_clean_one_deleted_snapshot(struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *root;

	int ret;

	struct btrfs_fs_info *fs_info = root->fs_info;



	spin_lock(&fs_info->trans_lock);

	if (list_empty(&fs_info->dead_roots)) {

fs/btrfs/transaction.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ int btrfs_wait_for_commit(struct btrfs_fs_info *fs_info, u64 transid); 
void btrfs_add_dead_root(struct btrfs_root *root);

int btrfs_defrag_root(struct btrfs_root *root);

void btrfs_maybe_wake_unfinished_drop(struct btrfs_fs_info *fs_info);

int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root);

int btrfs_clean_one_deleted_snapshot(struct btrfs_fs_info *fs_info);

int btrfs_commit_transaction(struct btrfs_trans_handle *trans);

void btrfs_commit_transaction_async(struct btrfs_trans_handle *trans);

int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans);