diff options
| author | Nikolay Borisov | 2017-06-27 10:02:26 +0300 |
|---|---|---|
| committer | David Sterba | 2017-08-16 14:19:52 +0200 |
| commit | f148ef4d3a8feb2e30017050e3534a4d0646b769 (patch) | |
| tree | 16c43b03201ce22e893589665bf50810a81cf20c /fs | |
| parent | e5600fd6fc7d1924ff77681128a364e1dad4435b (diff) | |
btrfs: Be explicit about usage of min()
__btrfs_alloc_chunk contains code which boils down to:
ndevs = min(ndevs, devs_max)
It's conditional upon devs_max not being 0. However, it cannot really be 0
since it's always set to either BTRFS_MAX_DEVS_SYS_CHUNK or
BTRFS_MAX_DEVS(fs_info->chunk_root). So eliminate the condition check and use
min explicitly. This has no functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b011753ce8bb..f93ac3d7e997 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4769,8 +4769,8 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, goto error; } - if (devs_max && ndevs > devs_max) - ndevs = devs_max; + ndevs = min(ndevs, devs_max); + /* * the primary goal is to maximize the number of stripes, so use as many * devices as possible, even if the stripes are not maximum sized. |