diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-08-03 05:56:33 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-08-03 05:56:33 -0600 |
| commit | 984ff00c6599e098cffce9e6886fd27aa10efcd4 (patch) | |
| tree | 680989e3173a02e44a58c90ec50e52fd8b00cd69 /include | |
| parent | block: ensure discard_granularity is zero when discard is not supported (diff) | |
| parent | md: make rdev_addable usable for rcu mode (diff) | |
| download | linux-984ff00c6599e098cffce9e6886fd27aa10efcd4.tar.gz linux-984ff00c6599e098cffce9e6886fd27aa10efcd4.zip | |
Merge tag 'md-6.17-20250803' of gitolite.kernel.org:pub/scm/linux/kernel/git/mdraid/linux into block-6.17
Pull MD changes from Yu:
"- mddev null-ptr-dereference fix, by Erkun
- md-cluster fail to remove the faulty disk regression fix, by Heming
- minor cleanup, by Li Nan and Jinchao
- mdadm lifetime regression fix reported by syzkaller, by Yu Kuai"
* tag 'md-6.17-20250803' of gitolite.kernel.org:pub/scm/linux/kernel/git/mdraid/linux:
md: make rdev_addable usable for rcu mode
md/raid1: remove struct pool_info and related code
md/raid1: change r1conf->r1bio_pool to a pointer type
md: rename recovery_cp to resync_offset
md/md-cluster: handle REMOVE message earlier
md: fix create on open mddev lifetime regression
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/raid/md_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index ff47b6f0ba0f..b13946287277 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h @@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { #else #error unspecified endianness #endif - __u32 recovery_cp; /* 11 recovery checkpoint sector count */ + __u32 resync_offset; /* 11 resync checkpoint sector count */ /* There are only valid for minor_version > 90 */ __u64 reshape_position; /* 12,13 next address in array-space for reshape */ __u32 new_level; /* 14 new level we are reshaping to */ |