diff options
| author | Jens Axboe | 2026-01-11 13:16:36 -0700 |
|---|---|---|
| committer | Jens Axboe | 2026-01-11 13:16:36 -0700 |
| commit | 5df832ba5f9ddc498e424ba859cb6ab7611b0384 (patch) | |
| tree | f73c9eac70adcc177cf64c548ce0bb41437f8a57 /block/bio-integrity-auto.c | |
| parent | bb8e2019ad613dd023a59bf91d1768018d17e09b (diff) | |
| parent | ca22c566b89164f6e670af56ecc45f47ef3df819 (diff) | |
Merge branch 'block-6.19' into for-7.0/block
Merge in fixes that went to 6.19 after for-7.0/block was branched.
Pending ublk changes depend on particularly the async scan work.
* block-6.19:
block: zero non-PI portion of auto integrity buffer
ublk: fix use-after-free in ublk_partition_scan_work
blk-mq: avoid stall during boot due to synchronize_rcu_expedited
loop: add missing bd_abort_claiming in loop_set_status
block: don't merge bios with different app_tags
blk-rq-qos: Remove unlikely() hints from QoS checks
loop: don't change loop device under exclusive opener in loop_set_status
block, bfq: update outdated comment
blk-mq: skip CPU offline notify on unmapped hctx
selftests/ublk: fix Makefile to rebuild on header changes
selftests/ublk: add test for async partition scan
ublk: scan partition in async way
block,bfq: fix aux stat accumulation destination
md: Fix forward incompatibility from configurable logical block size
md: Fix logical_block_size configuration being overwritten
md: suspend array while updating raid_disks via sysfs
md/raid5: fix possible null-pointer dereferences in raid5_store_group_thread_cnt()
md: Fix static checker warning in analyze_sbs
Diffstat (limited to 'block/bio-integrity-auto.c')
| -rw-r--r-- | block/bio-integrity-auto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bio-integrity-auto.c b/block/bio-integrity-auto.c index eb95e29c93bc..44dcdf7520c5 100644 --- a/block/bio-integrity-auto.c +++ b/block/bio-integrity-auto.c @@ -128,7 +128,7 @@ bool bio_integrity_prep(struct bio *bio) return true; set_flags = false; gfp |= __GFP_ZERO; - } else if (bi->csum_type == BLK_INTEGRITY_CSUM_NONE) + } else if (bi->metadata_size > bi->pi_tuple_size) gfp |= __GFP_ZERO; break; default: |