Skip to content

Commit 30efd38

Browse files
Christoph Hellwigmartinkpetersen
authored andcommitted
scsi: mpi3mr: Switch to using ->device_configure
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. Note that mpi3mr also updates the limits from an event handler that iterates all SCSI devices. This is also updated to use the queue_limits, but the complete locking of this path probably means it already is completely broken and needs a proper audit. Signed-off-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 310887f commit 30efd38

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/scsi/mpi3mr/mpi3mr.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,6 @@ void mpi3mr_wait_for_host_io(struct mpi3mr_ioc *mrioc, u32 timeout);
13521352
void mpi3mr_cleanup_fwevt_list(struct mpi3mr_ioc *mrioc);
13531353
void mpi3mr_flush_host_io(struct mpi3mr_ioc *mrioc);
13541354
void mpi3mr_invalidate_devhandles(struct mpi3mr_ioc *mrioc);
1355-
void mpi3mr_refresh_tgtdevs(struct mpi3mr_ioc *mrioc);
13561355
void mpi3mr_flush_delayed_cmd_lists(struct mpi3mr_ioc *mrioc);
13571356
void mpi3mr_check_rh_fault_ioc(struct mpi3mr_ioc *mrioc, u32 reason_code);
13581357
void mpi3mr_print_fault_info(struct mpi3mr_ioc *mrioc);

drivers/scsi/mpi3mr/mpi3mr_os.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,8 +1043,7 @@ mpi3mr_update_sdev(struct scsi_device *sdev, void *data)
10431043
*
10441044
* Return: Nothing.
10451045
*/
1046-
1047-
void mpi3mr_refresh_tgtdevs(struct mpi3mr_ioc *mrioc)
1046+
static void mpi3mr_refresh_tgtdevs(struct mpi3mr_ioc *mrioc)
10481047
{
10491048
struct mpi3mr_tgt_dev *tgtdev, *tgtdev_next;
10501049
struct mpi3mr_stgt_priv_data *tgt_priv;

0 commit comments

Comments
 (0)