From: Chris Mason Date: Fri, 19 Dec 2008 20:43:22 +0000 (-0500) Subject: Btrfs: Fix compile warning around num_online_cpus() in a min statement X-Git-Tag: v2.6.29-rc1~27^2~9^2~11 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b34b086c1c1d934c5314d46ba25ccfa9acc471ae;p=linux-2.6-omap-h63xx.git Btrfs: Fix compile warning around num_online_cpus() in a min statement Signed-off-by: Chris Mason --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 04f8d7080b1..40a540f3116 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);