From nobody Fri Apr 10 20:27:38 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 790E7C32771 for ; Fri, 19 Aug 2022 07:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347257AbiHSHx6 (ORCPT ); Fri, 19 Aug 2022 03:53:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345865AbiHSHxy (ORCPT ); Fri, 19 Aug 2022 03:53:54 -0400 Received: from mail-m972.mail.163.com (mail-m972.mail.163.com [123.126.97.2]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CD36995E4C; Fri, 19 Aug 2022 00:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=vIxxM CB3Kbo1suOSCWxUTAkIasvejZxcJgO9tarL/Ns=; b=GbqO1B4zTYyyEDPrv6g8m n57zMF3zeanLvOykEigbrMOPHAUhwfQQp/hYJ5I/vMRKnewxnXoIr3erRFi/BW/t VK0u0FqIL9ShetV+CUXbvWxylh6+DogXN9S3iAnLRSs7jL3tQ9ITka7aeARKoHRe kw0ZoP9kP+pmZX1yOgZLC0= Received: from localhost.localdomain (unknown [116.128.244.169]) by smtp2 (Coremail) with SMTP id GtxpCgCXi+dXQf9i0q+CWg--.44783S2; Fri, 19 Aug 2022 15:52:58 +0800 (CST) From: Jiangshan Yi <13667453960@163.com> To: jack@suse.cz, axboe@kernel.dk Cc: viro@zeniv.linux.org.uk, akpm@linux-foundation.org, reiserfs-devel@vger.kernel.org, linux-kernel@vger.kernel.org, Jiangshan Yi Subject: [PATCH] fs/reiserfs: replace ternary operator with min() and min_t() Date: Fri, 19 Aug 2022 15:52:40 +0800 Message-Id: <20220819075240.3199477-1-13667453960@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: GtxpCgCXi+dXQf9i0q+CWg--.44783S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxAr4rXFWfur1UKF47WF4UJwb_yoW5WryfpF 4xAr18KFWDGryDWFn7Zwn8Aw1Sq3sxJa1jqrWkZrWIva93tw1fJr4fKry3KFW8trZ3Xw1S qr4kKr1Fy34rJw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UCPfLUUUUU= X-Originating-IP: [116.128.244.169] X-CM-SenderInfo: bprtllyxuvjmiwq6il2tof0z/1tbiyAVg+1p7HaIJdgABs2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jiangshan Yi Fix the following coccicheck warning: fs/reiserfs/prints.c:459: WARNING opportunity for min(). fs/reiserfs/resize.c:100: WARNING opportunity for min(). fs/reiserfs/super.c:2508: WARNING opportunity for min(). fs/reiserfs/super.c:2557: WARNING opportunity for min(). min() and min_t() macro is defined in include/linux/minmax.h. It avoids multiple evaluations of the arguments when non-constant and performs strict type-checking. Signed-off-by: Jiangshan Yi --- fs/reiserfs/prints.c | 2 +- fs/reiserfs/resize.c | 2 +- fs/reiserfs/super.c | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c index 30319dc33c18..84a194b77f19 100644 --- a/fs/reiserfs/prints.c +++ b/fs/reiserfs/prints.c @@ -456,7 +456,7 @@ static int print_internal(struct buffer_head *bh, int f= irst, int last) to =3D B_NR_ITEMS(bh); } else { from =3D first; - to =3D last < B_NR_ITEMS(bh) ? last : B_NR_ITEMS(bh); + to =3D min_t(int, last, B_NR_ITEMS(bh)); } =20 reiserfs_printk("INTERNAL NODE (%ld) contains %z\n", bh->b_blocknr, bh); diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c index 8096c74c38ac..7b498a0d060b 100644 --- a/fs/reiserfs/resize.c +++ b/fs/reiserfs/resize.c @@ -97,7 +97,7 @@ int reiserfs_resize(struct super_block *s, unsigned long = block_count_new) * using the copy_size var below allows this code to work for * both shrinking and expanding the FS. */ - copy_size =3D bmap_nr_new < bmap_nr ? bmap_nr_new : bmap_nr; + copy_size =3D min(bmap_nr_new, bmap_nr); copy_size =3D copy_size * sizeof(struct reiserfs_list_bitmap_node *); for (i =3D 0; i < JOURNAL_NUM_BITMAPS; i++) { diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index c88cd2ce0665..da1e72494e30 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -2504,9 +2504,7 @@ static ssize_t reiserfs_quota_read(struct super_block= *sb, int type, char *data, len =3D i_size - off; toread =3D len; while (toread > 0) { - tocopy =3D - sb->s_blocksize - offset < - toread ? sb->s_blocksize - offset : toread; + tocopy =3D min_t(unsigned long, sb->s_blocksize - offset, toread); tmp_bh.b_state =3D 0; /* * Quota files are without tails so we can safely @@ -2554,8 +2552,7 @@ static ssize_t reiserfs_quota_write(struct super_bloc= k *sb, int type, return -EIO; } while (towrite > 0) { - tocopy =3D sb->s_blocksize - offset < towrite ? - sb->s_blocksize - offset : towrite; + tocopy =3D min_t(unsigned long, sb->s_blocksize - offset, towrite); tmp_bh.b_state =3D 0; reiserfs_write_lock(sb); err =3D reiserfs_get_block(inode, blk, &tmp_bh, GET_BLOCK_CREATE); --=20 2.25.1 No virus found Checked by Hillstone Network AntiVirus