| Message ID | 20240324235448.2039074-14-hch@lst.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/23] block: don't reject too large max_user_setors in blk_validate_limits | expand |
Hi, On Mon, Mar 25, 2024 at 07:54:38AM +0800, Christoph Hellwig wrote: > Switch to the ->device_configure method instead of ->slave_configure > and update the block limits on the passed in queue_limits instead > of using the per-limit accessors. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/firewire/sbp2.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) I'm not good at any kind of storage protocol, thus execute me not to review it. My concern is which subsystem provides the change to mainline. I don't mind it is your subsystem. Thanks Takashi Sakamoto
On Tue, Mar 26, 2024 at 06:30:45PM +0900, Takashi Sakamoto wrote: > > drivers/firewire/sbp2.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > I'm not good at any kind of storage protocol, thus execute me not to > review it. My concern is which subsystem provides the change to mainline. > I don't mind it is your subsystem. The whole series should go in together, probably through the scsi tree.
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 8f7810b2a4c10f..827dee0f57dde2 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c @@ -1506,7 +1506,8 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev) return 0; } -static int sbp2_scsi_slave_configure(struct scsi_device *sdev) +static int sbp2_scsi_device_configure(struct scsi_device *sdev, + struct queue_limits *lim) { struct sbp2_logical_unit *lu = sdev->hostdata; @@ -1532,7 +1533,7 @@ static int sbp2_scsi_slave_configure(struct scsi_device *sdev) sdev->start_stop_pwr_cond = 1; if (lu->tgt->workarounds & SBP2_WORKAROUND_128K_MAX_TRANS) - blk_queue_max_hw_sectors(sdev->request_queue, 128 * 1024 / 512); + lim->max_hw_sectors = 128 * 1024 / 512; return 0; } @@ -1590,7 +1591,7 @@ static const struct scsi_host_template scsi_driver_template = { .proc_name = "sbp2", .queuecommand = sbp2_scsi_queuecommand, .slave_alloc = sbp2_scsi_slave_alloc, - .slave_configure = sbp2_scsi_slave_configure, + .device_configure = sbp2_scsi_device_configure, .eh_abort_handler = sbp2_scsi_abort, .this_id = -1, .sg_tablesize = SG_ALL,
Switch to the ->device_configure method instead of ->slave_configure and update the block limits on the passed in queue_limits instead of using the per-limit accessors. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/firewire/sbp2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)