diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2023-04-26 23:52:34 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-04-26 23:52:34 +0300 |
| commit | cdc780f044a803aff8845b949f800f0f3d095d5f (patch) | |
| tree | 6695a80568f6b4aef414070f17859f434e229957 /block/blk.h | |
| parent | 38518593ec55e897abda4b4be77b2ec8ec4447d1 (diff) | |
| parent | 37386669887d3f2ccf021322c5558353d20f2387 (diff) | |
| download | linux-cdc780f044a803aff8845b949f800f0f3d095d5f.tar.xz | |
Merge branch 'for-6.4/amd-sfh' into for-linus
- assorted functional fixes for amd-sfh driver (Basavaraj Natikar)
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index 4c3b3325219a..cc4e8873dfde 100644 --- a/block/blk.h +++ b/block/blk.h @@ -156,6 +156,13 @@ static inline bool blk_discard_mergable(struct request *req) return false; } +static inline unsigned int blk_rq_get_max_segments(struct request *rq) +{ + if (req_op(rq) == REQ_OP_DISCARD) + return queue_max_discard_segments(rq->q); + return queue_max_segments(rq->q); +} + static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q, enum req_op op) { @@ -427,7 +434,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio, struct request_queue *blk_alloc_queue(int node_id); -int disk_scan_partitions(struct gendisk *disk, fmode_t mode, void *owner); +int disk_scan_partitions(struct gendisk *disk, fmode_t mode); int disk_alloc_events(struct gendisk *disk); void disk_add_events(struct gendisk *disk); |