summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2022-03-07 22:48:02 +0300
committerJens Axboe <axboe@kernel.dk>2022-03-07 22:48:02 +0300
commitd57c1cf43e7b33fdd790d50d972e0e5d6a0d20fe (patch)
tree9677a5c6208862bfa95b0b5b9d7a635b0d3b3e2f /include/linux
parente41ffa9cf0b1f74474a2fb961895a12c2d5ad7f9 (diff)
parentc75e707fe1aab32f1dc8e09845533b6542d9aaa9 (diff)
downloadlinux-d57c1cf43e7b33fdd790d50d972e0e5d6a0d20fe.tar.xz
Merge branch 'for-5.18/write-streams' into for-5.18/64bit-pi
* for-5.18/write-streams: block: remove the per-bio/request write hint nvme: remove support or stream based temperature hint
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blk_types.h1
-rw-r--r--include/linux/blkdev.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 5561e58d158a..ba8cfa57255f 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -250,7 +250,6 @@ struct bio {
*/
unsigned short bi_flags; /* BIO_* below */
unsigned short bi_ioprio;
- unsigned short bi_write_hint;
blk_status_t bi_status;
atomic_t __bi_remaining;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a12c031af887..226836ccd060 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -518,9 +518,6 @@ struct request_queue {
bool mq_sysfs_init_done;
-#define BLK_MAX_WRITE_HINTS 5
- u64 write_hints[BLK_MAX_WRITE_HINTS];
-
/*
* Independent sector access ranges. This is always NULL for
* devices that do not have multiple independent access ranges.