diff options
author | Chris Mason <chris.mason@oracle.com> | 2011-06-10 18:58:08 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-06-10 18:58:08 -0400 |
commit | 0e735872fb4b157a2fc94d4443f367e9aeb533a6 (patch) | |
tree | 03f7fa9a950f4c48050c445297493bb4dc75045f /fs/btrfs/disk-io.c | |
parent | 5be76758f35ec6578e5b9b150aa513ac26bd9c54 (diff) | |
parent | 6eef3125886df260ca0e8758d141308152226f6a (diff) | |
download | kernel_samsung_espresso10-0e735872fb4b157a2fc94d4443f367e9aeb533a6.zip kernel_samsung_espresso10-0e735872fb4b157a2fc94d4443f367e9aeb533a6.tar.gz kernel_samsung_espresso10-0e735872fb4b157a2fc94d4443f367e9aeb533a6.tar.bz2 |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into for-linus
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 33b744a..9f68c68 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); |