diff options
| author | Kari Argillander <kari.argillander@gmail.com> | 2021-09-07 17:28:41 +0300 |
|---|---|---|
| committer | Konstantin Komarov <almaz.alexandrovich@paragon-software.com> | 2021-09-16 17:01:37 +0300 |
| commit | b5322eb1ae94572f5a52e804857e641b846059f4 (patch) | |
| tree | 50732ccf6e1f0b0e6dadaa5ec636dd4a77739076 | |
| parent | f162f7b8dbc29742896f8a7e678bb31192716ae0 (diff) | |
| download | linux-stable-b5322eb1ae94572f5a52e804857e641b846059f4.tar.gz linux-stable-b5322eb1ae94572f5a52e804857e641b846059f4.tar.bz2 linux-stable-b5322eb1ae94572f5a52e804857e641b846059f4.zip | |
fs/ntfs3: Use clamp/max macros instead of comparisons
We can make code little more readable by using kernel macros clamp/max.
This were found with kernel included Coccinelle minmax script.
Signed-off-by: Kari Argillander <kari.argillander@gmail.com>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
| -rw-r--r-- | fs/ntfs3/fsntfs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c index 4cd24e4e58ff..c964d3996aab 100644 --- a/fs/ntfs3/fsntfs.c +++ b/fs/ntfs3/fsntfs.c @@ -8,6 +8,7 @@ #include <linux/blkdev.h> #include <linux/buffer_head.h> #include <linux/fs.h> +#include <linux/kernel.h> #include "debug.h" #include "ntfs.h" @@ -419,11 +420,8 @@ int ntfs_look_for_free_space(struct ntfs_sb_info *sbi, CLST lcn, CLST len, /* How many clusters to cat from zone. */ zlcn = wnd_zone_bit(wnd); zlen2 = zlen >> 1; - ztrim = len > zlen ? zlen : (len > zlen2 ? len : zlen2); - new_zlen = zlen - ztrim; - - if (new_zlen < NTFS_MIN_MFT_ZONE) - new_zlen = NTFS_MIN_MFT_ZONE; + ztrim = clamp_val(len, zlen2, zlen); + new_zlen = max_t(size_t, zlen - ztrim, NTFS_MIN_MFT_ZONE); wnd_zone_set(wnd, zlcn, new_zlen); |