From nobody Tue Feb 10 03:37:17 2026 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 963B633AD9C; Wed, 28 Jan 2026 08:06:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769587584; cv=none; b=OMguzaoetfq8Gc3NrH7pxlPUUZtNFKNnW+7Qy1x2jQM1ONhZYbhwaOXPppg+z4u7dckNl673pPQMPQiTkr+z9m4lBzGqcwkvhxTgio8DyzKA8GlAsopxlS/tKGSE0n//mbmcqaToAGYH2OWewXruoAVs2+G0QpUyhf6KchPBUdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769587584; c=relaxed/simple; bh=hyh5xxHW3TbkiRsSqhyv/vZFDOimcfRQ0MJJkiNayeo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qxvQfsJzxfb00r8R0CxI/wJmmgHtxNa4HzfiWYa48gJSnAgAx43MxMybuaAYCORo17yCSsK6ImZtZWC4cmb2zdtjiR3uRMqGH9a6FpmM78+X6SlO/4lF09xE36iXv5SsNYQxc50L1I+kkGQUxYdPxAuA8Kuo+hnEUTCusqmnIIU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.198]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4f1FG22WXHzKHMl1; Wed, 28 Jan 2026 16:06:02 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 87C1D40539; Wed, 28 Jan 2026 16:06:14 +0800 (CST) Received: from huaweicloud.com (unknown [10.50.87.129]) by APP4 (Coremail) with SMTP id gCh0CgBnFvd1w3lpPgyWFQ--.43207S11; Wed, 28 Jan 2026 16:06:14 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, yukuai@fnnas.com Cc: xni@redhat.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, linan666@huaweicloud.com, yangerkun@huawei.com, yi.zhang@huawei.com Subject: [PATCH v2 07/14] md/raid1: clean up useless sync_blocks handling in raid1_sync_request Date: Wed, 28 Jan 2026 15:57:01 +0800 Message-Id: <20260128075708.2259525-8-linan666@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20260128075708.2259525-1-linan666@huaweicloud.com> References: <20260128075708.2259525-1-linan666@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: gCh0CgBnFvd1w3lpPgyWFQ--.43207S11 X-Coremail-Antispam: 1UD129KBjvJXoW7CF43Ar43JFy7Cr4xAr1fWFg_yoW8AF17pa 17JryagryrWFW5Z3ZxAr1UCFyFkFy7trWUJFWfW3s7WFZ7Gr97CF4UXF1agFyqqa4aqrW5 X3s5AF45CFy3tF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQ014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUXVWUAwAv7VC2z280aVAFwI0_Gr1j6F4U JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7M4kE6xkIj40Ew7xC0wCY1x0262kKe7AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI 8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v2 6r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYVyIDUUUU X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Li Nan Since the loop is changed to while(0), some handling of sync_blocks in raid1_sync_request() is no longer needed and can be removed. No functional changes. Signed-off-by: Li Nan --- drivers/md/raid1.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 5954ead7dfd4..2308e16b1280 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2985,7 +2985,6 @@ static sector_t raid1_sync_request(struct mddev *mdde= v, sector_t sector_nr, if (max_sector > sector_nr + good_sectors) max_sector =3D sector_nr + good_sectors; nr_sectors =3D 0; - sync_blocks =3D 0; do { struct folio *folio; int len =3D RESYNC_BLOCK_SIZE; @@ -2993,15 +2992,13 @@ static sector_t raid1_sync_request(struct mddev *md= dev, sector_t sector_nr, len =3D (max_sector - sector_nr) << 9; if (len =3D=3D 0) break; - if (sync_blocks =3D=3D 0) { - if (!md_bitmap_start_sync(mddev, sector_nr, - &sync_blocks, still_degraded) && - !conf->fullsync && - !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) - break; - if ((len >> 9) > sync_blocks) - len =3D sync_blocks<<9; - } + if (!md_bitmap_start_sync(mddev, sector_nr, + &sync_blocks, still_degraded) && + !conf->fullsync && + !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) + break; + if ((len >> 9) > sync_blocks) + len =3D sync_blocks<<9; =20 for (i =3D 0 ; i < conf->raid_disks * 2; i++) { struct resync_folio *rf; @@ -3015,7 +3012,6 @@ static sector_t raid1_sync_request(struct mddev *mdde= v, sector_t sector_nr, } nr_sectors +=3D len>>9; sector_nr +=3D len>>9; - sync_blocks -=3D (len>>9); } while (0); =20 r1_bio->sectors =3D nr_sectors; --=20 2.39.2