From 1452ba137a079bd0011e4343fcb6a5dd5ae8b6a9 Mon Sep 17 00:00:00 2001 From: Guixin Liu Date: Fri, 31 May 2024 16:38:27 +0800 Subject: [PATCH] anolis: scsi: CHange scsi_internal_device_block_nowait intf ANBZ: #8740 Change scsi_internal_device_block_nowait intf. Signed-off-by: Guixin Liu --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++-- drivers/scsi/scsi_lib.c | 6 +++--- include/scsi/scsi_device.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 483832d16a0c..d61d18562f43 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -3602,7 +3602,7 @@ _scsih_internal_device_block(struct scsi_device *sdev, sas_device_priv_data->sas_target->handle); sas_device_priv_data->block = 1; - r = scsi_internal_device_block_nowait(sdev); + r = scsi_internal_device_block_nowait(sdev, 0); if (r == -EINVAL) sdev_printk(KERN_WARNING, sdev, "device_block failed with return(%d) for handle(0x%04x)\n", @@ -3638,7 +3638,7 @@ _scsih_internal_device_unblock(struct scsi_device *sdev, "performing a block followed by an unblock\n", r, sas_device_priv_data->sas_target->handle); sas_device_priv_data->block = 1; - r = scsi_internal_device_block_nowait(sdev); + r = scsi_internal_device_block_nowait(sdev, 0); if (r) sdev_printk(KERN_WARNING, sdev, "retried device_block " "failed with return(%d) for handle(0x%04x)\n", diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 6f3d29d16d1f..3ed8fee18c37 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2630,7 +2630,7 @@ EXPORT_SYMBOL(scsi_target_resume); * is paused until the device leaves the SDEV_BLOCK state. See also * scsi_internal_device_unblock_nowait(). */ -int scsi_internal_device_block_nowait(struct scsi_device *sdev) +int scsi_internal_device_block_nowait(struct scsi_device *sdev, int flag) { struct request_queue *q = sdev->request_queue; int err = 0; @@ -2674,7 +2674,7 @@ static int scsi_internal_device_block(struct scsi_device *sdev) int err; mutex_lock(&sdev->state_mutex); - err = scsi_internal_device_block_nowait(sdev); + err = scsi_internal_device_block_nowait(sdev, 0); if (err == 0) blk_mq_quiesce_queue(q); mutex_unlock(&sdev->state_mutex); @@ -2838,7 +2838,7 @@ scsi_host_block(struct Scsi_Host *shost) */ shost_for_each_device(sdev, shost) { mutex_lock(&sdev->state_mutex); - ret = scsi_internal_device_block_nowait(sdev); + ret = scsi_internal_device_block_nowait(sdev, 0); mutex_unlock(&sdev->state_mutex); if (ret) { scsi_device_put(sdev); diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 8b48ff499e1d..f603f8b316d0 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -527,7 +527,7 @@ static inline int scsi_device_created(struct scsi_device *sdev) sdev->sdev_state == SDEV_CREATED_BLOCK; } -int scsi_internal_device_block_nowait(struct scsi_device *sdev); +int scsi_internal_device_block_nowait(struct scsi_device *sdev, int flag); int scsi_internal_device_unblock_nowait(struct scsi_device *sdev, enum scsi_device_state new_state); -- Gitee