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

Commit 638aa7ed authored by Eric Sandeen's avatar Eric Sandeen Committed by David Sterba
Browse files

btrfs: factor btrfs_init_scrub() out of open_ctree() 



Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
[renamed to btrfs_init_scrub]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 04892340

fs/btrfs/disk-io.c

+12 −7
Original line number Diff line number Diff line
@@ -2147,6 +2147,17 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info) 
	}

}



static void btrfs_init_scrub(struct btrfs_fs_info *fs_info)

{

	mutex_init(&fs_info->scrub_lock);

	atomic_set(&fs_info->scrubs_running, 0);

	atomic_set(&fs_info->scrub_pause_req, 0);

	atomic_set(&fs_info->scrubs_paused, 0);

	atomic_set(&fs_info->scrub_cancel_req, 0);

	init_waitqueue_head(&fs_info->scrub_pause_wait);

	fs_info->scrub_workers_refcnt = 0;

}



int open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

	       char *options)
@@ -2295,14 +2306,8 @@ int open_ctree(struct super_block *sb, 
	}

	btrfs_init_delayed_root(fs_info->delayed_root);



	mutex_init(&fs_info->scrub_lock);

	atomic_set(&fs_info->scrubs_running, 0);

	atomic_set(&fs_info->scrub_pause_req, 0);

	atomic_set(&fs_info->scrubs_paused, 0);

	atomic_set(&fs_info->scrub_cancel_req, 0);

	btrfs_init_scrub(fs_info);

	init_waitqueue_head(&fs_info->replace_wait);

	init_waitqueue_head(&fs_info->scrub_pause_wait);

	fs_info->scrub_workers_refcnt = 0;

#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY

	fs_info->check_integrity_print_mask = 0;

#endif