Skip to content

Commit a88af90

Browse files
committed
md: keep recovery_cp in mdp_superblock_s
JIRA: https://issues.redhat.com/browse/RHEL-94433 commit c279732 Author: Xiao Ni <xni@redhat.com> Date: Fri Aug 15 12:00:28 2025 +0800 md: keep recovery_cp in mdp_superblock_s commit 907a99c ("md: rename recovery_cp to resync_offset") replaces recovery_cp with resync_offset in mdp_superblock_s which is in md_p.h. md_p.h is used in userspace too. So mdadm building fails because of this. This patch revert this change. Fixes: 907a99c ("md: rename recovery_cp to resync_offset") Signed-off-by: Xiao Ni <xni@redhat.com> Link: https://lore.kernel.org/linux-raid/20250815040028.18085-1-xni@redhat.com Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
1 parent b0ee9b7 commit a88af90

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/md/md.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@ static int super_90_validate(struct mddev *mddev, struct md_rdev *freshest, stru
14301430
else {
14311431
if (sb->events_hi == sb->cp_events_hi &&
14321432
sb->events_lo == sb->cp_events_lo) {
1433-
mddev->resync_offset = sb->resync_offset;
1433+
mddev->resync_offset = sb->recovery_cp;
14341434
} else
14351435
mddev->resync_offset = 0;
14361436
}
@@ -1561,13 +1561,13 @@ static void super_90_sync(struct mddev *mddev, struct md_rdev *rdev)
15611561
mddev->minor_version = sb->minor_version;
15621562
if (mddev->in_sync)
15631563
{
1564-
sb->resync_offset = mddev->resync_offset;
1564+
sb->recovery_cp = mddev->resync_offset;
15651565
sb->cp_events_hi = (mddev->events>>32);
15661566
sb->cp_events_lo = (u32)mddev->events;
15671567
if (mddev->resync_offset == MaxSector)
15681568
sb->state = (1<< MD_SB_CLEAN);
15691569
} else
1570-
sb->resync_offset = 0;
1570+
sb->recovery_cp = 0;
15711571

15721572
sb->layout = mddev->layout;
15731573
sb->chunk_size = mddev->chunk_sectors << 9;

include/uapi/linux/raid/md_p.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ typedef struct mdp_superblock_s {
173173
#else
174174
#error unspecified endianness
175175
#endif
176-
__u32 resync_offset; /* 11 resync checkpoint sector count */
176+
__u32 recovery_cp; /* 11 resync checkpoint sector count */
177177
/* There are only valid for minor_version > 90 */
178178
__u64 reshape_position; /* 12,13 next address in array-space for reshape */
179179
__u32 new_level; /* 14 new level we are reshaping to */

0 commit comments

Comments
 (0)