From 6e3331ee34461be37f50912295a2e924a673dbc6 Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport 6e3331ee3446] src: Use min/max macros instated of

 ternary operators

We can make code little bit more readable by using min/max macros.

These were found with Coccinelle.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/attrib.c |  3 ++-

 src/bitmap.c | 11 ++++++-----

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

 3 files changed, 11 insertions(+), 9 deletions(-)

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

index 12cff28f3e7155231e56864792dd764487297f37..c15cc17e3cd92864f30fd0d3fbb8f20b98437cde 100644

--- a/src/attrib.c

+++ b/src/attrib.c

@@ -8,6 +8,7 @@

 #include <linux/fs.h>

 #include <linux/slab.h>

+#include <linux/kernel.h>

 #include "debug.h"

 #include "ntfs.h"

@@ -1961,7 +1962,7 @@ int attr_punch_hole(struct ntfs_inode *ni, u64 vbo, u64 bytes, u32 *frame_size)

 			return 0;

 		from = vbo;

-		to = (vbo + bytes) < data_size ? (vbo + bytes) : data_size;

+		to = min_t(u64, vbo + bytes, data_size);

 		memset(Add2Ptr(resident_data(attr_b), from), 0, to - from);

 		return 0;

 	}

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

index a03584674fea13c818f341f8f2a5147957507709..aa184407520f0263844839e03d2f1edde3c6628f 100644

--- a/src/bitmap.c

+++ b/src/bitmap.c

@@ -12,6 +12,7 @@

 #include <linux/buffer_head.h>

 #include <linux/fs.h>

+#include <linux/kernel.h>

 #include "ntfs.h"

 #include "ntfs_fs.h"

@@ -432,7 +433,7 @@ static void wnd_remove_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len)

 		;

 	} else {

 		n3 = rb_next(&e->count.node);

-		max_new_len = len > new_len ? len : new_len;

+		max_new_len = max(len, new_len);

 		if (!n3) {

 			wnd->extent_max = max_new_len;

 		} else {

@@ -728,7 +729,7 @@ int wnd_set_free(struct wnd_bitmap *wnd, size_t bit, size_t bits)

 			wbits = wnd->bits_last;

 		tail = wbits - wbit;

-		op = tail < bits ? tail : bits;

+		op = min_t(u32, tail, bits);

 		bh = wnd_map(wnd, iw);

 		if (IS_ERR(bh)) {

@@ -781,7 +782,7 @@ int wnd_set_used(struct wnd_bitmap *wnd, size_t bit, size_t bits)

 			wbits = wnd->bits_last;

 		tail = wbits - wbit;

-		op = tail < bits ? tail : bits;

+		op = min_t(u32, tail, bits);

 		bh = wnd_map(wnd, iw);

 		if (IS_ERR(bh)) {

@@ -831,7 +832,7 @@ static bool wnd_is_free_hlp(struct wnd_bitmap *wnd, size_t bit, size_t bits)

 			wbits = wnd->bits_last;

 		tail = wbits - wbit;

-		op = tail < bits ? tail : bits;

+		op = min_t(u32, tail, bits);

 		if (wbits != wnd->free_bits[iw]) {

 			bool ret;

@@ -923,7 +924,7 @@ bool wnd_is_used(struct wnd_bitmap *wnd, size_t bit, size_t bits)

 			wbits = wnd->bits_last;

 		tail = wbits - wbit;

-		op = tail < bits ? tail : bits;

+		op = min_t(u32, tail, bits);

 		if (wnd->free_bits[iw]) {

 			bool ret;

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

index c964d3996aab1dff3923337acaa00e40869a70f5..77d2e56d5b4f34a693765d3230cf032122a04239 100644

--- a/src/fsntfs.c

+++ b/src/fsntfs.c

@@ -382,7 +382,7 @@ int ntfs_look_for_free_space(struct ntfs_sb_info *sbi, CLST lcn, CLST len,

 		}

 		lcn = wnd_zone_bit(wnd);

-		alen = zlen > len ? len : zlen;

+		alen = min_t(CLST, len, zlen);

 		wnd_zone_set(wnd, lcn + alen, zlen - alen);

@@ -1096,7 +1096,7 @@ int ntfs_sb_write_run(struct ntfs_sb_info *sbi, const struct runs_tree *run,

 	len = ((u64)clen << cluster_bits) - off;

 	for (;;) {

-		u32 op = len < bytes ? len : bytes;

+		u32 op = min_t(u64, len, bytes);

 		int err = ntfs_sb_write(sb, lbo, op, buf, 0);

 		if (err)

@@ -1297,7 +1297,7 @@ int ntfs_get_bh(struct ntfs_sb_info *sbi, const struct runs_tree *run, u64 vbo,

 	nb->off = off = lbo & (blocksize - 1);

 	for (;;) {

-		u32 len32 = len < bytes ? len : bytes;

+		u32 len32 = min_t(u64, len, bytes);

 		sector_t block = lbo >> sb->s_blocksize_bits;

 		do {

-- 

2.31.1