From 8898aa1ad916e73ce21900247c61fb75ad4a7347 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Fri, 15 Aug 2008 15:34:14 -0400 Subject: [PATCH] --- yaml --- r: 128893 b: refs/heads/master c: b720d209524fccdd33a499351f2ca880b8c0ffb4 h: refs/heads/master i: 128891: a476fbc91d20cc6d6bc3db3cfdc2b6449b0b1e68 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e6d0c5cf0cfc..a9d5f216a5ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db69e0ebae944690de89851315404f483e6464e0 +refs/heads/master: b720d209524fccdd33a499351f2ca880b8c0ffb4 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 56c54a41dbbb..99bd9f9b9eed 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -1348,7 +1348,9 @@ struct btrfs_root *open_ctree(struct super_block *sb, * cannot dynamically grow. */ btrfs_init_workers(&fs_info->workers, fs_info->thread_pool_size); - btrfs_init_workers(&fs_info->submit_workers, fs_info->thread_pool_size); + btrfs_init_workers(&fs_info->submit_workers, + min_t(u64, fs_devices->num_devices, + fs_info->thread_pool_size)); /* a higher idle thresh on the submit workers makes it much more * likely that bios will be send down in a sane order to the