remove ->rq_disk v2

Jens Axboe axboe at kernel.dk
Sat Nov 27 08:49:07 PST 2021


On Fri, 26 Nov 2021 13:17:57 +0100, Christoph Hellwig wrote:
> this series removes the rq_disk field in struct request, which isn't
> needed now that we can get the disk from the request_queue.
> 
> Changes since v1:
>  - rebased to the latests for-5.17/block tree
> 
> Diffstat:
>  block/blk-flush.c                  |    3 --
>  block/blk-merge.c                  |    7 ------
>  block/blk-mq.c                     |   24 +++++++-------------
>  block/blk.h                        |    2 -
>  block/bsg-lib.c                    |    2 -
>  drivers/block/amiflop.c            |    2 -
>  drivers/block/ataflop.c            |    6 ++---
>  drivers/block/floppy.c             |    6 ++---
>  drivers/block/mtip32xx/mtip32xx.c  |    2 -
>  drivers/block/null_blk/trace.h     |    2 -
>  drivers/block/paride/pcd.c         |    2 -
>  drivers/block/paride/pd.c          |    6 ++---
>  drivers/block/paride/pf.c          |    4 +--
>  drivers/block/pktcdvd.c            |    2 -
>  drivers/block/rnbd/rnbd-clt.c      |    4 +--
>  drivers/block/sunvdc.c             |    2 -
>  drivers/block/sx8.c                |    4 +--
>  drivers/block/virtio_blk.c         |    2 -
>  drivers/md/dm-mpath.c              |    1
>  drivers/mmc/core/block.c           |   12 +++++-----
>  drivers/mtd/mtd_blkdevs.c          |   10 +-------
>  drivers/nvme/host/core.c           |    4 +--
>  drivers/nvme/host/fault_inject.c   |    2 -
>  drivers/nvme/host/pci.c            |    7 ++----
>  drivers/nvme/host/trace.h          |    6 ++---
>  drivers/nvme/target/passthru.c     |    3 --
>  drivers/scsi/ch.c                  |    2 -
>  drivers/scsi/scsi_bsg.c            |    2 -
>  drivers/scsi/scsi_error.c          |    2 -
>  drivers/scsi/scsi_ioctl.c          |   43 ++++++++++++++-----------------------
>  drivers/scsi/scsi_lib.c            |    5 ++--
>  drivers/scsi/scsi_logging.c        |    4 ++-
>  drivers/scsi/sd.c                  |   26 +++++++++++-----------
>  drivers/scsi/sd_zbc.c              |    8 +++---
>  drivers/scsi/sg.c                  |    6 ++---
>  drivers/scsi/sr.c                  |   11 ++++-----
>  drivers/scsi/st.c                  |    4 +--
>  drivers/scsi/ufs/ufshpb.c          |    4 +--
>  drivers/scsi/virtio_scsi.c         |    2 -
>  drivers/target/target_core_pscsi.c |    2 -
>  drivers/usb/storage/transport.c    |    2 -
>  include/linux/blk-mq.h             |   11 ++-------
>  include/scsi/scsi_cmnd.h           |    2 -
>  include/scsi/scsi_device.h         |    4 +--
>  include/scsi/scsi_ioctl.h          |    4 +--
>  include/trace/events/block.h       |    8 +++---
>  kernel/trace/blktrace.c            |    2 -
>  47 files changed, 124 insertions(+), 157 deletions(-)
> 
> [...]

Applied, thanks!

[1/5] mtd_blkdevs: remove the sector out of range check in do_blktrans_request
      commit: c9e9ff5c8923f562091bebcd72164206cb48f08b
[2/5] block: don't check ->rq_disk in merges
      commit: e14b671dc11db224aad647a51581ee0320e132f7
[3/5] block: remove the ->rq_disk field in struct request
      commit: dc6d79f09226f4b4ff50dfa689c6982962ca53d1
[4/5] block: remove the gendisk argument to blk_execute_rq
      commit: 3d5ff0d19d14d9d2576f12621608600f562cef5c
[5/5] scsi: remove the gendisk argument to scsi_ioctl
      commit: 6273dc67219580d76880cb930d9fa97c52feee20

Best regards,
-- 
Jens Axboe





More information about the linux-mtd mailing list