1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 9ffdc335429..c96320d79fb 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -801,12 +801,14 @@ out:
 static void zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *req)
 {
         struct scsi_device *sdev = req->data;
-        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
+        struct zfcp_scsi_dev *zfcp_sdev;
         union fsf_status_qual *fsq = &req->qtcb->header.fsf_status_qual;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
+        zfcp_sdev = sdev_to_zfcp(sdev);
+
         switch (req->qtcb->header.fsf_status) {
         case FSF_PORT_HANDLE_NOT_VALID:
                 if (fsq->word[0] == fsq->word[1]) {
@@ -1769,13 +1771,15 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req)
 {
         struct zfcp_adapter *adapter = req->adapter;
         struct scsi_device *sdev = req->data;
-        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
+        struct zfcp_scsi_dev *zfcp_sdev;
         struct fsf_qtcb_header *header = &req->qtcb->header;
         struct fsf_qtcb_bottom_support *bottom = &req->qtcb->bottom.support;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
+        zfcp_sdev = sdev_to_zfcp(sdev);
+
         atomic_clear_mask(ZFCP_STATUS_COMMON_ACCESS_DENIED |
                           ZFCP_STATUS_COMMON_ACCESS_BOXED |
                           ZFCP_STATUS_LUN_SHARED |
@@ -1886,11 +1890,13 @@ out:
 static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req)
 {
         struct scsi_device *sdev = req->data;
-        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
+        struct zfcp_scsi_dev *zfcp_sdev;
 
         if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
                 return;
 
+        zfcp_sdev = sdev_to_zfcp(sdev);
+
         switch (req->qtcb->header.fsf_status) {
         case FSF_PORT_HANDLE_NOT_VALID:
                 zfcp_erp_adapter_reopen(zfcp_sdev->port->adapter, 0, "fscuh_1");
@@ -1980,7 +1986,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi)
 {
         struct fsf_qual_latency_info *lat_in;
         struct latency_cont *lat = NULL;
-        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(scsi->device);
+        struct zfcp_scsi_dev *zfcp_sdev;
         struct zfcp_blk_drv_data blktrc;
         int ticks = req->adapter->timer_ticks;
 
@@ -1995,6 +2001,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi)
 
         if (req->adapter->adapter_features & FSF_FEATURE_MEASUREMENT_DATA &&
             !(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {
+                zfcp_sdev = sdev_to_zfcp(scsi->device);
                 blktrc.flags |= ZFCP_BLK_LAT_VALID;
                 blktrc.channel_lat = lat_in->channel_lat * ticks;
                 blktrc.fabric_lat = lat_in->fabric_lat * ticks;
@@ -2032,12 +2039,14 @@ static void zfcp_fsf_fcp_handler_common(struct zfcp_fsf_req *req)
 {
         struct scsi_cmnd *scmnd = req->data;
         struct scsi_device *sdev = scmnd->device;
-        struct zfcp_scsi_dev *zfcp_sdev = sdev_to_zfcp(sdev);
+        struct zfcp_scsi_dev *zfcp_sdev;
         struct fsf_qtcb_header *header = &req->qtcb->header;
 
         if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ERROR))
                 return;
 
+        zfcp_sdev = sdev_to_zfcp(sdev);
+
         switch (header->fsf_status) {
         case FSF_HANDLE_MISMATCH:
         case FSF_PORT_HANDLE_NOT_VALID: