summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-12-19 15:43:22 -0500
committerChris Mason <chris.mason@oracle.com>2008-12-19 15:43:22 -0500
commitb34b086c1c1d934c5314d46ba25ccfa9acc471ae (patch)
treee95f18b5f64ac96d14189c4a5b12b34fe33b6cda /fs/btrfs
parent1f80e4db0fcb3bdc2be51389baf558a9519682f0 (diff)
downloadop-kernel-dev-b34b086c1c1d934c5314d46ba25ccfa9acc471ae.zip
op-kernel-dev-b34b086c1c1d934c5314d46ba25ccfa9acc471ae.tar.gz
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/btrfs')
-rw-r--r--fs/btrfs/disk-io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 04f8d70..40a540f 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,
fs_info->btree_inode->i_ino = 1;
fs_info->btree_inode->i_nlink = 1;
- fs_info->thread_pool_size = min(num_online_cpus() + 2, 8);
+ fs_info->thread_pool_size = min_t(unsigned long,
+ num_online_cpus() + 2, 8);
INIT_LIST_HEAD(&fs_info->ordered_extents);
spin_lock_init(&fs_info->ordered_extent_lock);
OpenPOWER on IntegriCloud