diff options
author | Chris Mason <chris.mason@oracle.com> | 2008-12-19 15:43:22 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-12-19 15:43:22 -0500 |
commit | b34b086c1c1d934c5314d46ba25ccfa9acc471ae (patch) | |
tree | e95f18b5f64ac96d14189c4a5b12b34fe33b6cda /fs | |
parent | 1f80e4db0fcb3bdc2be51389baf558a9519682f0 (diff) |
Btrfs: Fix compile warning around num_online_cpus() in a min statement
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 04f8d7080b17..40a540f31161 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1528,7 +1528,8 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1528 | fs_info->btree_inode->i_ino = 1; | 1528 | fs_info->btree_inode->i_ino = 1; |
1529 | fs_info->btree_inode->i_nlink = 1; | 1529 | fs_info->btree_inode->i_nlink = 1; |
1530 | 1530 | ||
1531 | fs_info->thread_pool_size = min(num_online_cpus() + 2, 8); | 1531 | fs_info->thread_pool_size = min_t(unsigned long, |
1532 | num_online_cpus() + 2, 8); | ||
1532 | 1533 | ||
1533 | INIT_LIST_HEAD(&fs_info->ordered_extents); | 1534 | INIT_LIST_HEAD(&fs_info->ordered_extents); |
1534 | spin_lock_init(&fs_info->ordered_extent_lock); | 1535 | spin_lock_init(&fs_info->ordered_extent_lock); |