On 21/06/2022 12:15, John Garry wrote:
Hi Jens,
about this series, would you be ok to pick this up for merging? Do you
find the changes acceptable?
Thanks,
John
In [0] I included "blk-mq: Add a flag for reserved requests" to identify
if a request is 'reserved' for special handling. Doing this is easier than
passing a 'reserved' arg to the blk_mq_ops callbacks. Indeed, only 1x
timeout implementation or blk-mq iter function actually uses the
'reserved' arg (or 3x if you count SCSI core and FNIC SCSI driver). So
this series drops the 'reserved' arg for these timeout and iter functions.
Christoph suggested that I try to upstream now.
Differences to v1:
- Use "scsi_timeout" as name for SCSI timeout function and update docs
- Add RB tags (thanks!)
- Split out patch to drop local variables for 'reserved', as requested by
Bart
Based on following:
6dbcddf6e76b (block/for-5.20/block) block: bfq: Fix kernel-doc headers
[0] https://lore.kernel.org/linux-scsi/1654770559-101375-1-git-send-email-john.garry@xxxxxxxxxx/T/#m22aa9f89e55835edc2e650d43f7e3219a3a1a324
John Garry (6):
scsi: core: Remove reserved request time-out handling
blk-mq: Add a flag for reserved requests
blk-mq: Drop blk_mq_ops.timeout 'reserved' arg
scsi: fnic: Drop reserved request handling
blk-mq: Drop 'reserved' arg of busy_tag_iter_fn
blk-mq: Drop local variable for reserved tag
Documentation/scsi/scsi_eh.rst | 3 +--
Documentation/scsi/scsi_mid_low_api.rst | 2 +-
block/blk-mq-debugfs.c | 2 +-
block/blk-mq-tag.c | 13 +++++--------
block/blk-mq.c | 22 +++++++++++++---------
block/bsg-lib.c | 2 +-
drivers/block/mtip32xx/mtip32xx.c | 11 +++++------
drivers/block/nbd.c | 5 ++---
drivers/block/null_blk/main.c | 2 +-
drivers/infiniband/ulp/srp/ib_srp.c | 3 +--
drivers/mmc/core/queue.c | 3 +--
drivers/nvme/host/apple.c | 3 +--
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/fc.c | 6 ++----
drivers/nvme/host/nvme.h | 2 +-
drivers/nvme/host/pci.c | 2 +-
drivers/nvme/host/rdma.c | 3 +--
drivers/nvme/host/tcp.c | 3 +--
drivers/s390/block/dasd.c | 2 +-
drivers/s390/block/dasd_int.h | 2 +-
drivers/scsi/aacraid/comminit.c | 2 +-
drivers/scsi/aacraid/linit.c | 2 +-
drivers/scsi/fnic/fnic_scsi.c | 14 ++++----------
drivers/scsi/hosts.c | 14 ++++++--------
drivers/scsi/mpi3mr/mpi3mr_os.c | 16 ++++------------
drivers/scsi/scsi_error.c | 6 +++---
drivers/scsi/scsi_lib.c | 8 --------
drivers/scsi/scsi_priv.h | 2 +-
include/linux/blk-mq.h | 10 ++++++++--
include/scsi/scsi_host.h | 2 +-
30 files changed, 71 insertions(+), 98 deletions(-)
