Pull core block updates from Jens Axboe: "Another nice round of removing more code than what is added, mostly due to Christoph's relentless pursuit of tech debt removal/cleanups. This pull request contains: - Two series of BFQ improvements (Paolo, Jan, Jia) - Block iov_iter improvements (Pavel) - bsg error path fix (Pan) - blk-mq scheduler improvements (Jan) - -EBUSY discard fix (Jan) - bvec allocation improvements (Ming, Christoph) - bio allocation and init improvements (Christoph) - Store bdev pointer in bio instead of gendisk + partno (Christoph) - Block trace point cleanups (Christoph) - hard read-only vs read-only split (Christoph) - Block based swap cleanups (Christoph) - Zoned write granularity support (Damien) - Various fixes/tweaks (Chunguang, Guoqing, Lei, Lukas, Huhai)" * tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block: (104 commits) mm: simplify swapdev_block sd_zbc: clear zone resources for non-zoned case block: introduce blk_queue_clear_zone_settings() zonefs: use zone write granularity as block size block: introduce zone_write_granularity limit block: use blk_queue_set_zoned in add_partition() nullb: use blk_queue_set_zoned() to setup zoned devices nvme: cleanup zone information initialization block: document zone_append_max_bytes attribute block: use bi_max_vecs to find the bvec pool md/raid10: remove dead code in reshape_request block: mark the bio as cloned in bio_iov_bvec_set block: set BIO_NO_PAGE_REF in bio_iov_bvec_set block: remove a layer of indentation in bio_iov_iter_get_pages block: turn the nr_iovecs argument to bio_alloc* into an unsigned short block: remove the 1 and 4 vec bvec_slabs entries block: streamline bvec_alloc block: factor out a bvec_alloc_gfp helper block: move struct biovec_slab to bio.c block: reuse BIO_INLINE_VECS for integrity bvecs ...
Showing the changes to kernel (1 of 148 files). Show all
Unified · Split
| @@ -903,7 +903,7 @@ static void blk_add_trace_bio(struct request_queue *q, struct bio *bio, · 902 unmodified lines | ||
| 903 | 903 | |
| 904 | 904 | static void blk_add_trace_bio_bounce(void *ignore, struct bio *bio) |
| 905 | 905 | { |
| 906 | − blk_add_trace_bio(bio->bi_disk->queue, bio, BLK_TA_BOUNCE, 0); | |
| 906 | + blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_BOUNCE, 0); | |
| 907 | 907 | } |
| 908 | 908 | |
| 909 | 909 | static void blk_add_trace_bio_complete(void *ignore, |
| @@ -915,22 +915,24 @@ static void blk_add_trace_bio_complete(void *ignore, · 5 unmodified lines | ||
| 915 | 915 | |
| 916 | 916 | static void blk_add_trace_bio_backmerge(void *ignore, struct bio *bio) |
| 917 | 917 | { |
| 918 | − blk_add_trace_bio(bio->bi_disk->queue, bio, BLK_TA_BACKMERGE, 0); | |
| 918 | + blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_BACKMERGE, | |
| 919 | + 0); | |
| 919 | 920 | } |
| 920 | 921 | |
| 921 | 922 | static void blk_add_trace_bio_frontmerge(void *ignore, struct bio *bio) |
| 922 | 923 | { |
| 923 | − blk_add_trace_bio(bio->bi_disk->queue, bio, BLK_TA_FRONTMERGE, 0); | |
| 924 | + blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_FRONTMERGE, | |
| 925 | + 0); | |
| 924 | 926 | } |
| 925 | 927 | |
| 926 | 928 | static void blk_add_trace_bio_queue(void *ignore, struct bio *bio) |
| 927 | 929 | { |
| 928 | − blk_add_trace_bio(bio->bi_disk->queue, bio, BLK_TA_QUEUE, 0); | |
| 930 | + blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_QUEUE, 0); | |
| 929 | 931 | } |
| 930 | 932 | |
| 931 | 933 | static void blk_add_trace_getrq(void *ignore, struct bio *bio) |
| 932 | 934 | { |
| 933 | − blk_add_trace_bio(bio->bi_disk->queue, bio, BLK_TA_GETRQ, 0); | |
| 935 | + blk_add_trace_bio(bio->bi_bdev->bd_disk->queue, bio, BLK_TA_GETRQ, 0); | |
| 934 | 936 | } |
| 935 | 937 | |
| 936 | 938 | static void blk_add_trace_plug(void *ignore, struct request_queue *q) |
| @@ -967,7 +969,7 @@ static void blk_add_trace_unplug(void *ignore, struct request_queue *q, · 30 unmodified lines | ||
| 967 | 969 | |
| 968 | 970 | static void blk_add_trace_split(void *ignore, struct bio *bio, unsigned int pdu) |
| 969 | 971 | { |
| 970 | − struct request_queue *q = bio->bi_disk->queue; | |
| 972 | + struct request_queue *q = bio->bi_bdev->bd_disk->queue; | |
| 971 | 973 | struct blk_trace *bt; |
| 972 | 974 | |
| 973 | 975 | rcu_read_lock(); |
| @@ -997,7 +999,7 @@ static void blk_add_trace_split(void *ignore, struct bio *bio, unsigned int pdu) · 23 unmodified lines | ||
| 997 | 999 | static void blk_add_trace_bio_remap(void *ignore, struct bio *bio, dev_t dev, |
| 998 | 1000 | sector_t from) |
| 999 | 1001 | { |
| 1000 | − struct request_queue *q = bio->bi_disk->queue; | |
| 1002 | + struct request_queue *q = bio->bi_bdev->bd_disk->queue; | |
| 1001 | 1003 | struct blk_trace *bt; |
| 1002 | 1004 | struct blk_io_trace_remap r; |
| 1003 | 1005 | |