From b5322eb1ae94572f5a52e804857e641b846059f4 Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Tue, 7 Sep 2021 17:28:41 +0300

Subject: [Backport b5322eb1ae94] src: 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>

---

 src/fsntfs.c | 8 +++-----

 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/fsntfs.c b/src/fsntfs.c

index 4cd24e4e58ff26b3ddce5f891783a36cca6170a7..c964d3996aab1dff3923337acaa00e40869a70f5 100644

--- a/src/fsntfs.c

+++ b/src/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);

-- 

2.31.1