diff options
| author | Thorsten Blum <thorsten.blum@linux.dev> | 2026-06-02 19:07:57 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2026-06-02 20:14:52 +0300 |
| commit | aa528cd12ca6e7fda15f855b6d2095fd34d167e0 (patch) | |
| tree | 9fa76b40ba5af123ce136fdde3b089a56b675953 | |
| parent | 6636e16e60e9f6ac09bf2faf88bce0c5cde7d83c (diff) | |
| download | linux-aa528cd12ca6e7fda15f855b6d2095fd34d167e0.tar.xz | |
block/partitions/acorn: use min in {riscix,linux}_partition
Use min() to replace the open-coded implementations and to simplify
riscix_partition() and linux_partition().
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Kees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20260602160757.973736-3-thorsten.blum@linux.dev
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/partitions/acorn.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c index 9f7389f174d0..067d6a27a3bd 100644 --- a/block/partitions/acorn.c +++ b/block/partitions/acorn.c @@ -9,6 +9,7 @@ */ #include <linux/buffer_head.h> #include <linux/adfs_fs.h> +#include <linux/minmax.h> #include "check.h" @@ -80,7 +81,7 @@ static int riscix_partition(struct parsed_partitions *state, if (rr->magic == RISCIX_MAGIC) { - unsigned long size = nr_sects > 2 ? 2 : nr_sects; + unsigned long size = min(nr_sects, 2); int part; seq_buf_puts(&state->pp_buf, " <"); @@ -124,7 +125,7 @@ static int linux_partition(struct parsed_partitions *state, { Sector sect; struct linux_part *linuxp; - unsigned long size = nr_sects > 2 ? 2 : nr_sects; + unsigned long size = min(nr_sects, 2); seq_buf_puts(&state->pp_buf, " [Linux]"); |