diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-22 20:04:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-22 20:04:09 +0200 |
| commit | 0256994887d7c89c2a41d872aac67605bda8f115 (patch) | |
| tree | 2eb9062a07d84b6027a7ef139fa82ab207428d0e /drivers/scsi | |
| parent | Merge tag 'bcachefs-2024-07-22' of https://evilpiepirate.org/git/bcachefs (diff) | |
| parent | block: don't free the integrity payload in bio_integrity_unmap_free_user (diff) | |
| download | linux-0256994887d7c89c2a41d872aac67605bda8f115.tar.xz linux-0256994887d7c89c2a41d872aac67605bda8f115.zip | |
Merge tag 'for-6.11/block-post-20240722' of git://git.kernel.dk/linux
Pull block integrity mapping updates from Jens Axboe:
"A set of cleanups and fixes for the block integrity support.
Sent separately from the main block changes from last week, as they
depended on later fixes in the 6.10-rc cycle"
* tag 'for-6.11/block-post-20240722' of git://git.kernel.dk/linux:
block: don't free the integrity payload in bio_integrity_unmap_free_user
block: don't free submitter owned integrity payload on I/O completion
block: call bio_integrity_unmap_free_user from blk_rq_unmap_user
block: don't call bio_uninit from bio_endio
block: also return bio_integrity_payload * from stubs
block: split integrity support out of bio.h
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2e933fd1de70..adeaa8ab9951 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -33,11 +33,12 @@ * than the level indicated above to trigger output. */ +#include <linux/bio-integrity.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/bio.h> +#include <linux/bio-integrity.h> #include <linux/hdreg.h> #include <linux/errno.h> #include <linux/idr.h> |