Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-18 10:56:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: zfcp: decouple SCSI setup of TMF from scsi_cmnd

Browse Source 
Actually change the signature of zfcp_fsf_fcp_task_mgmt().
Since it was prepared in the previous patch, we only need to delete
a local auto variable which is now the intended argument.

Prepare zfcp_fsf_fcp_task_mgmt's caller zfcp_task_mgmt_function()
to have its function body only depend on a scsi_device and derived objects.

Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Steffen Maier 2018-05-17 19:14:54 +02:00 committed by Martin K. Petersen
parent 39abb11aca
commit 26f5fa9d47
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/scsi/zfcp_ext.h
View File

@ -123,7 +123,8 @@ extern int zfcp_fsf_send_els(struct zfcp_adapter *, u32,
struct zfcp_fsf_ct_els *, unsigned int); struct zfcp_fsf_ct_els *, unsigned int);
extern int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *); extern int zfcp_fsf_fcp_cmnd(struct scsi_cmnd *);
extern void zfcp_fsf_req_free(struct zfcp_fsf_req *); extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);
extern struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *, u8); extern struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_device *sdev,
u8 tm_flags);
extern struct zfcp_fsf_req *zfcp_fsf_abort_fcp_cmnd(struct scsi_cmnd *); extern struct zfcp_fsf_req *zfcp_fsf_abort_fcp_cmnd(struct scsi_cmnd *);
extern void zfcp_fsf_reqid_check(struct zfcp_qdio *, int); extern void zfcp_fsf_reqid_check(struct zfcp_qdio *, int);

12
drivers/s390/scsi/zfcp_fsf.c
View File

@ -2314,17 +2314,17 @@ static void zfcp_fsf_fcp_task_mgmt_handler(struct zfcp_fsf_req *req)
} }
/** /**
* zfcp_fsf_fcp_task_mgmt - send SCSI task management command * zfcp_fsf_fcp_task_mgmt() - Send SCSI task management command (TMF).
* @scmnd: SCSI command to send the task management command for * @sdev: Pointer to SCSI device to send the task management command to.
* @tm_flags: unsigned byte for task management flags * @tm_flags: Unsigned byte for task management flags.
* Returns: on success pointer to struct fsf_req, NULL otherwise *
* Return: On success pointer to struct zfcp_fsf_req, %NULL otherwise.
*/ */
struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_cmnd *scmnd, struct zfcp_fsf_req *zfcp_fsf_fcp_task_mgmt(struct scsi_device *sdev,
u8 tm_flags) u8 tm_flags)
{ {
struct zfcp_fsf_req *req = NULL; struct zfcp_fsf_req *req = NULL;
struct fcp_cmnd *fcp_cmnd; struct fcp_cmnd *fcp_cmnd;
struct scsi_device *sdev = scmnd->device;
struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev); struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
struct zfcp_qdio *qdio = zfcp_sdev->port->adapter->qdio; struct zfcp_qdio *qdio = zfcp_sdev->port->adapter->qdio;

2
drivers/s390/scsi/zfcp_scsi.c
View File

@ -275,7 +275,7 @@ static int zfcp_task_mgmt_function(struct scsi_cmnd *scpnt, u8 tm_flags)
int retry = 3; int retry = 3;
while (retry--) { while (retry--) {
fsf_req = zfcp_fsf_fcp_task_mgmt(scpnt, tm_flags); fsf_req = zfcp_fsf_fcp_task_mgmt(sdev, tm_flags);
if (fsf_req) if (fsf_req)
break; break;