diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-06-11 00:58:08 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-06-11 00:58:08 +0200 |
| commit | 0e735872fb4b157a2fc94d4443f367e9aeb533a6 (patch) | |
| tree | 03f7fa9a950f4c48050c445297493bb4dc75045f /fs/btrfs/disk-io.c | |
| parent | btrfs: fix unlocked access of delalloc_inodes (diff) | |
| parent | btrfs: remove unneeded includes from scrub.c (diff) | |
| download | linux-0e735872fb4b157a2fc94d4443f367e9aeb533a6.tar.xz linux-0e735872fb4b157a2fc94d4443f367e9aeb533a6.zip | |
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 33b744a5ac03..9f68c6898653 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); |