Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+17
-8
+5
drivers/md/md.c
+5
drivers/md/md.c
···
9125
9125
}
9126
9126
9127
9127
action = md_sync_action(mddev);
9128
+
if (action == ACTION_FROZEN || action == ACTION_IDLE) {
9129
+
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
9130
+
goto skip;
9131
+
}
9132
+
9128
9133
desc = md_sync_action_name(action);
9129
9134
mddev->last_sync_action = action;
9130
9135
+1
-1
drivers/md/raid1.c
+1
-1
drivers/md/raid1.c
···
1225
1225
int i = 0;
1226
1226
struct bio *behind_bio = NULL;
1227
1227
1228
-
behind_bio = bio_alloc_bioset(NULL, vcnt, 0, GFP_NOIO,
1228
+
behind_bio = bio_alloc_bioset(NULL, vcnt, bio->bi_opf, GFP_NOIO,
1229
1229
&r1_bio->mddev->bio_set);
1230
1230
1231
1231
/* discard op, we don't support writezero/writesame yet */
+11
-7
drivers/nvme/host/core.c
+11
-7
drivers/nvme/host/core.c
···
903
903
u32 upper, lower;
904
904
u64 ref48;
905
905
906
+
/* only type1 and type 2 PI formats have a reftag */
907
+
switch (ns->head->pi_type) {
908
+
case NVME_NS_DPS_PI_TYPE1:
909
+
case NVME_NS_DPS_PI_TYPE2:
910
+
break;
911
+
default:
912
+
return;
913
+
}
914
+
906
915
/* both rw and write zeroes share the same reftag format */
907
916
switch (ns->head->guard_type) {
908
917
case NVME_NVM_NS_16B_GUARD:
···
951
942
952
943
if (nvme_ns_has_pi(ns->head)) {
953
944
cmnd->write_zeroes.control |= cpu_to_le16(NVME_RW_PRINFO_PRACT);
954
-
955
-
switch (ns->head->pi_type) {
956
-
case NVME_NS_DPS_PI_TYPE1:
957
-
case NVME_NS_DPS_PI_TYPE2:
958
-
nvme_set_ref_tag(ns, cmnd, req);
959
-
break;
960
-
}
945
+
nvme_set_ref_tag(ns, cmnd, req);
961
946
}
962
947
963
948
return BLK_STS_OK;
···
1042
1039
if (WARN_ON_ONCE(!nvme_ns_has_pi(ns->head)))
1043
1040
return BLK_STS_NOTSUPP;
1044
1041
control |= NVME_RW_PRINFO_PRACT;
1042
+
nvme_set_ref_tag(ns, cmnd, req);
1045
1043
}
1046
1044
1047
1045
if (bio_integrity_flagged(req->bio, BIP_CHECK_GUARD))