[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 25b3a8237a03ec0b67b965b52d74862e77ef7115
WARNING: Author mismatch between patch and upstream commit:
Backport author: Yu Kuai<yukuai1@xxxxxxxxxxxxxxx>
Commit author: Benjamin Marzinski<bmarzins@xxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: 25b3a8237a03e ! 1: 64000dbb8dcf7 md/raid5: recheck if reshape has finished with device_lock held
@@ Metadata
## Commit message ##
md/raid5: recheck if reshape has finished with device_lock held
+ commit 25b3a8237a03ec0b67b965b52d74862e77ef7115 upstream.
+
When handling an IO request, MD checks if a reshape is currently
happening, and if so, where the IO sector is in relation to the reshape
progress. MD uses conf->reshape_progress for both of these tasks. When
@@ Commit message
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
Signed-off-by: Song Liu <song@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240702151802.1632010-1-bmarzins@xxxxxxxxxx
+ Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
## drivers/md/raid5.c ##
-@@ drivers/md/raid5.c: static int add_all_stripe_bios(struct r5conf *conf,
- return ret;
+@@ drivers/md/raid5.c: static bool reshape_disabled(struct mddev *mddev)
+ return is_md_suspended(mddev) || !md_is_rdwr(mddev);
}
+enum reshape_loc {
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
| stable/linux-6.1.y | Failed | N/A |
