diff options
| author | Arne Jansen <sensille@gmx.net> | 2011-06-10 12:07:07 +0200 |
|---|---|---|
| committer | Arne Jansen <sensille@gmx.net> | 2011-06-10 12:14:13 +0200 |
| commit | 632dd772fcbde2ba37c0e8983bd38ef4a1eac906 (patch) | |
| tree | 6181590ab930fb20c3efb3f44f88901089b9618b /fs/btrfs | |
| parent | 8c51032f978bac5bec5dae0c5de4f85db97c1cc9 (diff) | |
| download | linux-3.10-632dd772fcbde2ba37c0e8983bd38ef4a1eac906.tar.gz linux-3.10-632dd772fcbde2ba37c0e8983bd38ef4a1eac906.tar.bz2 linux-3.10-632dd772fcbde2ba37c0e8983bd38ef4a1eac906.zip | |
btrfs: reinitialize scrub workers
Scrub starts the workers each time a scrub starts and stops them after it
finished. This patch adds an initialization for the workers before each
start, otherwise the workers behave strangely.
Signed-off-by: Arne Jansen <sensille@gmx.net>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/scrub.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index a203d363184..7bbbfebe47e 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1668,8 +1668,6 @@ struct btrfs_root *open_ctree(struct super_block *sb, init_waitqueue_head(&fs_info->scrub_pause_wait); init_rwsem(&fs_info->scrub_super_lock); fs_info->scrub_workers_refcnt = 0; - btrfs_init_workers(&fs_info->scrub_workers, "scrub", - fs_info->thread_pool_size, &fs_info->generic_worker); sb->s_blocksize = 4096; sb->s_blocksize_bits = blksize_bits(4096); diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index d5a4108ceda..92cac19388e 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -1166,8 +1166,12 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_root *root) struct btrfs_fs_info *fs_info = root->fs_info; mutex_lock(&fs_info->scrub_lock); - if (fs_info->scrub_workers_refcnt == 0) + if (fs_info->scrub_workers_refcnt == 0) { + btrfs_init_workers(&fs_info->scrub_workers, "scrub", + fs_info->thread_pool_size, &fs_info->generic_worker); + fs_info->scrub_workers.idle_thresh = 4; btrfs_start_workers(&fs_info->scrub_workers, 1); + } ++fs_info->scrub_workers_refcnt; mutex_unlock(&fs_info->scrub_lock); |