target/pscsi: call spc_emulate_report_luns directly

No need to indirect through spc_parse_cdb if we only ever call it for
REPORT LUNS emulation.

(nab: Add missing EXPORT_SYMBOL for spc_emulate_report_luns)

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

2 files changed, 4 insertions, 10 deletions

diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index b2965084eb4f..dc10e29934d7 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -985,8 +985,6 @@ static inline void pscsi_clear_cdb_lun(unsigned char *cdb)
 static int pscsi_parse_cdb(struct se_cmd *cmd)
 {
         unsigned char *cdb = cmd->t_task_cdb;
-        unsigned int dummy_size;
-        int ret;
 
         if (cmd->se_cmd_flags & SCF_BIDI) {
                 cmd->se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION;
@@ -1003,10 +1001,7 @@ static int pscsi_parse_cdb(struct se_cmd *cmd)
          */
         switch (cdb[0]) {
         case REPORT_LUNS:
-                ret = spc_parse_cdb(cmd, &dummy_size);
-                if (ret)
-                        return ret;
-                break;
+                return spc_emulate_report_luns(cmd);
         case READ_6:
         case READ_10:
         case READ_12:
@@ -1020,10 +1015,8 @@ static int pscsi_parse_cdb(struct se_cmd *cmd)
                 /* FALLTHROUGH*/
         default:
                 cmd->execute_cmd = pscsi_execute_cmd;
-                break;
+                return 0;
         }
-
-        return 0;
 }
 
 static int pscsi_execute_cmd(struct se_cmd *cmd)
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c
index 07b82700dcd8..1f1ddb8183c7 100644
--- a/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@ -908,7 +908,7 @@ static int spc_emulate_request_sense(struct se_cmd *cmd)
         return 0;
 }
 
-static int spc_emulate_report_luns(struct se_cmd *cmd)
+int spc_emulate_report_luns(struct se_cmd *cmd)
 {
         struct se_dev_entry *deve;
         struct se_session *sess = cmd->se_sess;
@@ -970,6 +970,7 @@ done:
         target_complete_cmd(cmd, GOOD);
         return 0;
 }
+EXPORT_SYMBOL(spc_emulate_report_luns);
 
 static int spc_emulate_testunitready(struct se_cmd *cmd)
 {