3 files changed, 14 insertions, 13 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 150d7bb675a1..2afb96b801cb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1082,11 +1082,10 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)
 EXPORT_SYMBOL(scsi_setup_blk_pc_cmnd);
 
 /*
- * Setup a REQ_TYPE_FS command.  These are simple read/write request
- * from filesystems that still need to be translated to SCSI CDBs from
- * the ULD.
+ * Setup a REQ_TYPE_FS command.  These are simple request from filesystems
+ * that still need to be translated to SCSI CDBs from the ULD.
  */
-int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
+static int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
 {
         struct scsi_cmnd *cmd = req->special;
 
@@ -1098,9 +1097,8 @@ int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
         }
 
         memset(cmd->cmnd, 0, BLK_MAX_CDB);
-        return scsi_init_io(cmd, GFP_ATOMIC);
+        return scsi_cmd_to_driver(cmd)->init_command(cmd);
 }
-EXPORT_SYMBOL(scsi_setup_fs_cmnd);
 
 static int
 scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
@@ -1205,12 +1203,16 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                 goto out;
         }
 
-        if (req->cmd_type == REQ_TYPE_FS)
-                ret = scsi_cmd_to_driver(cmd)->init_command(cmd);
-        else if (req->cmd_type == REQ_TYPE_BLOCK_PC)
+        switch (req->cmd_type) {
+        case REQ_TYPE_FS:
+                ret = scsi_setup_fs_cmnd(sdev, req);
+                break;
+        case REQ_TYPE_BLOCK_PC:
                 ret = scsi_setup_blk_pc_cmnd(sdev, req);
-        else
+                break;
+        default:
                 ret = BLKPREP_KILL;
+        }
 
 out:
         return scsi_prep_return(q, req, ret);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 87566b51fcf7..1b166c7ea891 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -894,7 +894,7 @@ static int sd_init_command(struct scsi_cmnd *SCpnt)
                 ret = scsi_setup_flush_cmnd(sdp, rq);
                 goto out;
         }
-        ret = scsi_setup_fs_cmnd(sdp, rq);
+        ret = scsi_init_io(SCpnt, GFP_ATOMIC);
         if (ret != BLKPREP_OK)
                 goto out;
         SCpnt = rq->special;
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index a7ea27c01286..9feeb3766d7d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -385,10 +385,9 @@ static int sr_init_command(struct scsi_cmnd *SCpnt)
         int block = 0, this_count, s_size;
         struct scsi_cd *cd;
         struct request *rq = SCpnt->request;
-        struct scsi_device *sdp = SCpnt->device;
         int ret;
 
-        ret = scsi_setup_fs_cmnd(sdp, rq);
+        ret = scsi_init_io(SCpnt, GFP_ATOMIC);
         if (ret != BLKPREP_OK)
                 goto out;
         SCpnt = rq->special;