diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-05 10:25:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-05 10:25:57 -0700 |
| commit | e9eaca6bf69d3f261b9bd51637420b05c9352965 (patch) | |
| tree | e4d391e69b2b1b8b56a60130e814586a2ca54bf8 /drivers/md/raid1.c | |
| parent | c8ed9b5c02a5ceb3d8244f3862a7e64cf0b5648e (diff) | |
| parent | 743bf030947169c413a711f60cebe73f837e649f (diff) | |
| download | linux-e9eaca6bf69d3f261b9bd51637420b05c9352965.tar.gz linux-e9eaca6bf69d3f261b9bd51637420b05c9352965.tar.bz2 linux-e9eaca6bf69d3f261b9bd51637420b05c9352965.zip | |
Merge tag 'block-6.17-20250905' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- NVMe pull request via Keith
- Fix protection information ref tag for device side gen/strip
(Christoph)
- MD pull request via Yu
- fix data loss for writemostly in raid1 (Yu Kuai)
- fix potentional data loss by skipping recovery (Li Nan)
* tag 'block-6.17-20250905' of git://git.kernel.dk/linux:
md: prevent incorrect update of resync/recovery offset
md/raid1: fix data lost for writemostly rdev
nvme: fix PI insert on write
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 408c26398321..bf44878ec640 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1225,7 +1225,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio, int i = 0; struct bio *behind_bio = NULL; - behind_bio = bio_alloc_bioset(NULL, vcnt, 0, GFP_NOIO, + behind_bio = bio_alloc_bioset(NULL, vcnt, bio->bi_opf, GFP_NOIO, &r1_bio->mddev->bio_set); /* discard op, we don't support writezero/writesame yet */ |