diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-20 11:28:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-20 11:28:02 -0700 |
| commit | 977b1ef51866aa7170409af80740788d4f9c4841 (patch) | |
| tree | 629c009c0ac92956b5c5a4b0b6848a95d3682135 /include | |
| parent | 39316e5fa94157ac1eb481c762d1e688b2f08138 (diff) | |
| parent | 01bc4fda9ea0a6b52f12326486f07a4910666cf6 (diff) | |
| download | linux-977b1ef51866aa7170409af80740788d4f9c4841.tar.gz | |
Merge tag 'block-6.9-20240420' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Just two minor fixes that should go into the 6.9 kernel release, one
fixing a regression with partition scanning errors, and one fixing a
WARN_ON() that can get triggered if we race with a timer"
* tag 'block-6.9-20240420' of git://git.kernel.dk/linux:
blk-iocost: do not WARN if iocg was already offlined
block: propagate partition scanning errors to the BLKRRPART ioctl
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 172c918799995..69e7da33ca49a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -128,6 +128,8 @@ typedef unsigned int __bitwise blk_mode_t; #define BLK_OPEN_WRITE_IOCTL ((__force blk_mode_t)(1 << 4)) /* open is exclusive wrt all other BLK_OPEN_WRITE opens to the device */ #define BLK_OPEN_RESTRICT_WRITES ((__force blk_mode_t)(1 << 5)) +/* return partition scanning errors */ +#define BLK_OPEN_STRICT_SCAN ((__force blk_mode_t)(1 << 6)) struct gendisk { /* |