[PATCH -next] bcachefs: fix opportunity for min/max warnings

[Li Zetao]

There are some warnings reported by cocci:

  fs/bcachefs/journal.c:764:20-21: WARNING opportunity for min()
  fs/bcachefs/fsck.c:2050:12-13: WARNING opportunity for min()
  fs/bcachefs/fsck.c:1549:12-13: WARNING opportunity for min()
  fs/bcachefs/buckets.h:180:10-11: WARNING opportunity for max()

Use min() or max() to simplify the code.

Signed-off-by: Li Zetao <lizet...@huawei.com>
---
 fs/bcachefs/buckets.h | 4 +---
 fs/bcachefs/fsck.c    | 4 ++--
 fs/bcachefs/journal.c | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index edbdffd508fc..6974a80f5487 100644
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -175,9 +175,7 @@ static inline int gen_cmp(u8 a, u8 b)
 
 static inline int gen_after(u8 a, u8 b)
 {
-       int r = gen_cmp(a, b);
-
-       return r > 0 ? r : 0;
+       return max(gen_cmp(a, b), 0);
 }
 
 static inline int dev_ptr_stale_rcu(struct bch_dev *ca, const struct 
bch_extent_ptr *ptr)
diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index 9138944c5ae6..d290b4f5605a 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -1546,7 +1546,7 @@ static int check_extent(struct btree_trans *trans, struct 
btree_iter *iter,
 
        ret = bch2_check_key_has_snapshot(trans, iter, k);
        if (ret) {
-               ret = ret < 0 ? ret : 0;
+               ret = min(ret, 0);
                goto out;
        }
 
@@ -2047,7 +2047,7 @@ static int check_dirent(struct btree_trans *trans, struct 
btree_iter *iter,
 
        ret = bch2_check_key_has_snapshot(trans, iter, k);
        if (ret) {
-               ret = ret < 0 ? ret : 0;
+               ret = min(ret, 0);
                goto out;
        }
 
diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index 649e3a01608a..959570a367f6 100644
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -761,7 +761,7 @@ int bch2_journal_flush_seq(struct journal *j, u64 seq)
        if (!ret)
                bch2_time_stats_update(j->flush_seq_time, start_time);
 
-       return ret ?: ret2 < 0 ? ret2 : 0;
+       return ret ?: min(ret2, 0);
 }
 
 /*
-- 
2.34.1