mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-22 03:27:30 -04:00
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>
This commit is contained in:
committed by
Jens Axboe
parent
6636e16e60
commit
aa528cd12c
@@ -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]");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user