From mboxrd@z Thu Jan 1 00:00:00 1970 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 E1B96C4708E for ; Thu, 5 Jan 2023 20:52:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235532AbjAEUwI (ORCPT ); Thu, 5 Jan 2023 15:52:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235541AbjAEUwG (ORCPT ); Thu, 5 Jan 2023 15:52:06 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CE2263D24 for ; Thu, 5 Jan 2023 12:52:04 -0800 (PST) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 305BDjUx028971 for ; Thu, 5 Jan 2023 12:52:04 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=Itao23zfTfOR2T0HeXnec+oGsVZUH4zqCODN/YrFWnI=; b=TyIrvFLLeoLcqXgUvsG6FPH1sDbVroW0z/Aw3Cjv4GR/EJpSdcgNGxYyyIGdjNUnbjB4 QWFGPlJWjsvmp5/t6ql5IstGcadgccgzsBychc+XtvscCKr8Eoz9QP72qrEZKHb90Zzg 13JsEEinCuGq9YUWEh+BOMKwVkaQoy9RXqFLJygbFAbQAXMVrifTnoFWu3KcipaGtB9/ f8OimDFGmAjwN7lGLvEJ1ePO3V1O1Ubwio+UZ0TNU8HRU0kteGrzuZd3paL3b3c29+je NdbD9rdYDm13ThzhPLYvq6LPn4zQo9a/qa61IMyIchSahGn2iw5OCTGhtc539tOsyQbD hA== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3mw2bpp28k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 05 Jan 2023 12:52:04 -0800 Received: from twshared16996.15.frc2.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 12:52:02 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 45937E45DCBD; Thu, 5 Jan 2023 12:51:47 -0800 (PST) From: Keith Busch To: , CC: , , Damien Le Moal , Keith Busch Subject: [PATCHv4 1/2] block: make BLK_DEF_MAX_SECTORS unsigned Date: Thu, 5 Jan 2023 12:51:45 -0800 Message-ID: <20230105205146.3610282-2-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230105205146.3610282-1-kbusch@meta.com> References: <20230105205146.3610282-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: plh0k7oKXwbQsx2kaCI1X7B-I8pYCQ2d X-Proofpoint-ORIG-GUID: plh0k7oKXwbQsx2kaCI1X7B-I8pYCQ2d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-05_12,2023-01-05_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Keith Busch This is used as an unsigned value, so define it that way to avoid having to cast it. Suggested-by: Christoph Hellwig Signed-off-by: Keith Busch --- block/blk-settings.c | 2 +- drivers/block/null_blk/main.c | 3 +-- include/linux/blkdev.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index 0477c4d527fee..9875ca131eb0c 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -135,7 +135,7 @@ void blk_queue_max_hw_sectors(struct request_queue *q= , unsigned int max_hw_secto limits->max_hw_sectors =3D max_hw_sectors; =20 max_sectors =3D min_not_zero(max_hw_sectors, limits->max_dev_sectors); - max_sectors =3D min_t(unsigned int, max_sectors, BLK_DEF_MAX_SECTORS); + max_sectors =3D min(max_sectors, BLK_DEF_MAX_SECTORS); max_sectors =3D round_down(max_sectors, limits->logical_block_size >> SECTOR_SHIFT); limits->max_sectors =3D max_sectors; diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.= c index 7d28e3aa406c2..4c601ca9552a0 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -2123,8 +2123,7 @@ static int null_add_dev(struct nullb_device *dev) blk_queue_physical_block_size(nullb->q, dev->blocksize); if (!dev->max_sectors) dev->max_sectors =3D queue_max_hw_sectors(nullb->q); - dev->max_sectors =3D min_t(unsigned int, dev->max_sectors, - BLK_DEF_MAX_SECTORS); + dev->max_sectors =3D min(dev->max_sectors, BLK_DEF_MAX_SECTORS); blk_queue_max_hw_sectors(nullb->q, dev->max_sectors); =20 if (dev->virt_boundary) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 43d4e073b1115..2b85161e22561 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1095,11 +1095,12 @@ static inline bool bdev_is_partition(struct block= _device *bdev) enum blk_default_limits { BLK_MAX_SEGMENTS =3D 128, BLK_SAFE_MAX_SECTORS =3D 255, - BLK_DEF_MAX_SECTORS =3D 2560, BLK_MAX_SEGMENT_SIZE =3D 65536, BLK_SEG_BOUNDARY_MASK =3D 0xFFFFFFFFUL, }; =20 +#define BLK_DEF_MAX_SECTORS 2560u + static inline unsigned long queue_segment_boundary(const struct request_= queue *q) { return q->limits.seg_boundary_mask; --=20 2.30.2