Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     axboe@kernel.dk, song@kernel.org, viro@zeniv.linux.org.uk,
        brauner@kernel.org, xiang@kernel.org, chao@kernel.org,
        huyue2@coolpad.com, jefflexu@linux.alibaba.com, hch@infradead.org,
        djwong@kernel.org
Cc:     linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        linux-erofs@lists.ozlabs.org, linux-xfs@vger.kernel.org,
        Yangtao Li <frank.li@vivo.com>
Subject: [PATCH 3/7] md: Convert to queue_logical_block_mask()
Date:   Wed, 28 Jun 2023 17:34:56 +0800
Message-Id: <20230628093500.68779-3-frank.li@vivo.com>
In-Reply-To: <20230628093500.68779-1-frank.li@vivo.com>
References: <20230628093500.68779-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jbuJzBLQ7CTYO/ZyDNTjISEEjfVXBNyoacZC7M9wiXzQF/f/fSO+fmqH4mxg?=
 =?us-ascii?Q?PdAQ0+LwE4j6FR4Vxvsbo2WElcaM0jjFx4eSTuUSBHoWZZ/D8GhCTdhVASQ0?=
 =?us-ascii?Q?V/lRTaLVey07mlmvmQbLHFQF7f/ONWGIYBuMIYUCfWpmPxdX0E8N0C9GUBv4?=
 =?us-ascii?Q?Q26DVcBEJRhVbTeQrWmpO2VwoN3kfTOeh7kp1WMVy3BSX1ATc7b98Dl40P4Z?=
 =?us-ascii?Q?T9YsTKwomOKBroDBrCZf9pphyaM2p61xu+jToze7Coy8aEl5wjKyD5FwhH7i?=
 =?us-ascii?Q?n5raCyZ3OY7yKDdVAAKTPclpjPWHW9DKH3TzgcyIyjFetsQEsW1ChwBJw/7y?=
 =?us-ascii?Q?VAAIJ7zOlesk+e5FJFjSlOJQqbTU/HZqeI0MqzP5BFeJXxCWAuT3myF3lFPT?=
 =?us-ascii?Q?DWc155gJVCeQ4j4ZZye3JyBP/0ilcbi9ZMtVcltIhy4yk0vXynaQBo+6jmwe?=
 =?us-ascii?Q?04WsCUTynFcbhhlIHsNylso+Hygh/9R3lbfFpReEQaXDNAcUzpj4spvn0YAd?=
 =?us-ascii?Q?PdAE9z9CWsAk1YXFPw8y7prdEfB7AwWkI1j48YcZY6dNKW/FkBv0i8f6SfcB?=
 =?us-ascii?Q?E8WquNXxLLaffQYmB1xi5oSJIQ6uP4cSKahkpAZHl+hLxWoX9/494jUVOpik?=
 =?us-ascii?Q?fiGj0klXxJrYnJ0ETjXWgKIpNbtgSvcPNYsEjs+xV+Rp+Arny7ihLengB7/S?=
 =?us-ascii?Q?KZjulh5m5R5LkuglD5+vxqqfB89aNq6yMj4dKFLuu4gaM1NtGzYa3Fl8Oce+?=
 =?us-ascii?Q?hXid3KutoR8FJI8Z1GUj+jhkaBV0zXRodXXN4FVM0g6vQuN3Z/koqwjX8UP7?=
 =?us-ascii?Q?D4bQsn1x3UVclxEAoXwR2KRmzuL+A1jInJLwpxixQ9WjhBeYl2Ox3urEQl9/?=
 =?us-ascii?Q?tPOm7vGAmoGMCUUwA6AkB7bI3zLdkV/NedscvUY5E8PpDCzorno3CLgi6uWD?=
 =?us-ascii?Q?Xux1ai7Ojn6HOYSaPgsJ+aqttFdcXICqDI9VfREBTgq4CHX5nd7letSBNLul?=
 =?us-ascii?Q?Uy4Oek0nHySLA3KfNwB3m+hWoNOyjPWiHWij+jdA+aUjNNyY+F3BxLDJB8oP?=
 =?us-ascii?Q?GRLA46y1+24tADYHB8pGVJkCt11noohEQyILY0wgy9u5wHPU+c0CN6pbPayI?=
 =?us-ascii?Q?Yjvhkl5xq6VTJSUzFLGvqnHpPcyd/QxKha76D2WNLhQXGxfxwXtuhHlbQTov?=
 =?us-ascii?Q?hnU3dWHcEfWjNjDWrMjKsnWSgak7rG9OL1v1sYlBXCm1ASrMevGZNtvJmkmc?=
 =?us-ascii?Q?go/qi2vbuzrD1YxtaOK5gtFbAX/6BSHtWPRBrrh+Ic+Js61cqlYwXrQCO8wb?=
 =?us-ascii?Q?iI7g/AXajpXYVOFd+6hu5XXmS+/8nyJs6KbCkjd5sdC+OwL60AYNjAtl2653?=
 =?us-ascii?Q?G+Zd8uHcnIbEwGOWGtUE9qvPntSnUXa1rrvwBIhiBqTyQXOOhBVyTlpXsHKk?=
 =?us-ascii?Q?kz25+CBbSXznT9AvIYwaaJOopfv6GqYvYgnIRCDkHDOPmdDmjsRL7i50MksJ?=
 =?us-ascii?Q?lAI/OUsriCFAYGR/jS9IUS+SIyy2N8JRskocQ6SYd4D9fZW/wzKr0oDzX7ty?=
 =?us-ascii?Q?zfS6LFCaCOW99hAqtaXZPoMjFnFqlPWpABrJXRto?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b086d052-bdd6-4a8b-1816-08db77baff73
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2023 09:35:23.8529
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: fijrr8w34IvV2VgqLajcnIebXYMsMjFJ/xtol2EGGjr9av/BUgkFrCmpdms5OS2khZcYtVQRqVONCBFUXGvcmg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6144
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use queue_logical_block_mask() to simplify code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/md/md.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 2e38ef421d69..fd646e5ed082 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1649,7 +1649,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
 	atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
 
 	rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
-	bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
+	bmask = queue_logical_block_mask(rdev->bdev->bd_disk->queue);
 	if (rdev->sb_size & bmask)
 		rdev->sb_size = (rdev->sb_size | bmask) + 1;
 
@@ -2062,7 +2062,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
 		int bmask;
 		sb->max_dev = cpu_to_le32(max_dev);
 		rdev->sb_size = max_dev * 2 + 256;
-		bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
+		bmask = queue_logical_block_mask(rdev->bdev->bd_disk->queue);
 		if (rdev->sb_size & bmask)
 			rdev->sb_size = (rdev->sb_size | bmask) + 1;
 	} else
-- 
2.39.0