target: Remove session_reinstatement parameter from ->transport_wait_for_tasks

[pandora-kernel.git] / drivers / target / target_core_transport.c

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index bee923f..e590526 100644 (file)
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -86,9 +86,7 @@ static u32 transport_allocate_tasks(struct se_cmd *cmd,
                enum dma_data_direction data_direction,
                struct scatterlist *sgl, unsigned int nents);
 static int transport_generic_get_mem(struct se_cmd *cmd);
-static int transport_generic_remove(struct se_cmd *cmd,
-               int session_reinstatement);
-static bool transport_put_cmd(struct se_cmd *cmd);
+static void transport_put_cmd(struct se_cmd *cmd);
 static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
                struct se_queue_obj *qobj);
 static int transport_set_sense_codes(struct se_cmd *cmd, u8 asc, u8 ascq);
@@ -599,7 +597,7 @@ void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
                return;
        if (remove) {
                transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj);
-               transport_generic_remove(cmd, 0);
+               transport_put_cmd(cmd);
        }
 }
 
@@ -610,7 +608,7 @@ void transport_cmd_finish_abort_tmr(struct se_cmd *cmd)
        if (transport_cmd_check_stop_to_fabric(cmd))
                return;
 
-       transport_generic_remove(cmd, 0);
+       transport_put_cmd(cmd);
 }
 
 static void transport_add_cmd_to_queue(
@@ -1640,7 +1638,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
        return 0;
 }
 
-static void transport_generic_wait_for_tasks(struct se_cmd *, int, int);
+static void transport_generic_wait_for_tasks(struct se_cmd *, int);
 
 /*     transport_generic_allocate_tasks():
  *
@@ -2072,7 +2070,7 @@ static void transport_generic_request_timeout(struct se_cmd *cmd)
        unsigned long flags;
 
        /*
-        * Reset cmd->t_se_count to allow transport_generic_remove()
+        * Reset cmd->t_se_count to allow transport_put_cmd()
         * to allow last call to free memory resources.
         */
        spin_lock_irqsave(&cmd->t_state_lock, flags);
@@ -2083,7 +2081,7 @@ static void transport_generic_request_timeout(struct se_cmd *cmd)
        }
        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
-       transport_generic_remove(cmd, 0);
+       transport_put_cmd(cmd);
 }
 
 static inline u32 transport_lba_21(unsigned char *cdb)
@@ -2506,7 +2504,7 @@ void transport_new_cmd_failure(struct se_cmd *se_cmd)
        spin_unlock_irqrestore(&se_cmd->t_state_lock, flags);
 }
 
-static void transport_nop_wait_for_tasks(struct se_cmd *, int, int);
+static void transport_nop_wait_for_tasks(struct se_cmd *, int);
 
 static inline u32 transport_get_sectors_6(
        unsigned char *cdb,
@@ -3732,83 +3730,43 @@ static inline void transport_free_pages(struct se_cmd *cmd)
        cmd->t_bidi_data_nents = 0;
 }
 
-static inline void transport_release_tasks(struct se_cmd *cmd)
-{
-       transport_free_dev_tasks(cmd);
-}
-
-static inline int transport_dec_and_check(struct se_cmd *cmd)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&cmd->t_state_lock, flags);
-       if (atomic_read(&cmd->t_fe_count)) {
-               if (!atomic_dec_and_test(&cmd->t_fe_count)) {
-                       spin_unlock_irqrestore(&cmd->t_state_lock,
-                                       flags);
-                       return 1;
-               }
-       }
-
-       if (atomic_read(&cmd->t_se_count)) {
-               if (!atomic_dec_and_test(&cmd->t_se_count)) {
-                       spin_unlock_irqrestore(&cmd->t_state_lock,
-                                       flags);
-                       return 1;
-               }
-       }
-       spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-
-       return 0;
-}
-
 /**
  * transport_put_cmd - release a reference to a command
  * @cmd:       command to release
  *
  * This routine releases our reference to the command and frees it if possible.
  */
-static bool transport_put_cmd(struct se_cmd *cmd)
+static void transport_put_cmd(struct se_cmd *cmd)
 {
        unsigned long flags;
-
-       if (transport_dec_and_check(cmd))
-               return false;
+       int free_tasks = 0;
 
        spin_lock_irqsave(&cmd->t_state_lock, flags);
-       if (!atomic_read(&cmd->transport_dev_active)) {
-               spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-               goto free_pages;
+       if (atomic_read(&cmd->t_fe_count)) {
+               if (!atomic_dec_and_test(&cmd->t_fe_count))
+                       goto out_busy;
+       }
+
+       if (atomic_read(&cmd->t_se_count)) {
+               if (!atomic_dec_and_test(&cmd->t_se_count))
+                       goto out_busy;
+       }
+
+       if (atomic_read(&cmd->transport_dev_active)) {
+               atomic_set(&cmd->transport_dev_active, 0);
+               transport_all_task_dev_remove_state(cmd);
+               free_tasks = 1;
        }
-       atomic_set(&cmd->transport_dev_active, 0);
-       transport_all_task_dev_remove_state(cmd);
        spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 
-       transport_release_tasks(cmd);
-       return true;
+       if (free_tasks != 0)
+               transport_free_dev_tasks(cmd);
 
-free_pages:
        transport_free_pages(cmd);
        transport_release_cmd(cmd);
-       return true;
-}
-
-static int
-transport_generic_remove(struct se_cmd *cmd, int session_reinstatement)
-{
-       unsigned long flags;
-
-       if (!transport_put_cmd(cmd)) {
-               if (session_reinstatement) {
-                       spin_lock_irqsave(&cmd->t_state_lock, flags);
-                       transport_all_task_dev_remove_state(cmd);
-                       spin_unlock_irqrestore(&cmd->t_state_lock,
-                                       flags);
-               }
-               return 1;
-       }
-
-       return 0;
+       return;
+out_busy:
+       spin_unlock_irqrestore(&cmd->t_state_lock, flags);
 }
 
 /*
@@ -4372,43 +4330,29 @@ void transport_release_cmd(struct se_cmd *cmd)
 }
 EXPORT_SYMBOL(transport_release_cmd);
 
-/*     transport_generic_free_cmd():
- *
- *     Called from processing frontend to release storage engine resources
- */
-void transport_generic_free_cmd(
-       struct se_cmd *cmd,
-       int wait_for_tasks,
-       int session_reinstatement)
+void transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
 {
        if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD))
                transport_release_cmd(cmd);
        else {
                core_dec_lacl_count(cmd->se_sess->se_node_acl, cmd);
 
-               if (cmd->se_lun) {
-#if 0
-                       pr_debug("cmd: %p ITT: 0x%08x contains"
-                               " cmd->se_lun\n", cmd,
-                               cmd->se_tfo->get_task_tag(cmd));
-#endif
+               if (cmd->se_lun)
                        transport_lun_remove_cmd(cmd);
-               }
 
                if (wait_for_tasks && cmd->transport_wait_for_tasks)
-                       cmd->transport_wait_for_tasks(cmd, 0, 0);
+                       cmd->transport_wait_for_tasks(cmd, 0);
 
                transport_free_dev_tasks(cmd);
 
-               transport_generic_remove(cmd, session_reinstatement);
+               transport_put_cmd(cmd);
        }
 }
 EXPORT_SYMBOL(transport_generic_free_cmd);
 
 static void transport_nop_wait_for_tasks(
        struct se_cmd *cmd,
-       int remove_cmd,
-       int session_reinstatement)
+       int remove_cmd)
 {
        return;
 }
@@ -4589,8 +4533,7 @@ int transport_clear_lun_from_sessions(struct se_lun *lun)
  */
 static void transport_generic_wait_for_tasks(
        struct se_cmd *cmd,
-       int remove_cmd,
-       int session_reinstatement)
+       int remove_cmd)
 {
        unsigned long flags;
 
@@ -4666,7 +4609,7 @@ remove:
        if (!remove_cmd)
                return;
 
-       transport_generic_free_cmd(cmd, 0, session_reinstatement);
+       transport_generic_free_cmd(cmd, 0);
 }
 
 static int transport_get_sense_codes(
@@ -5087,7 +5030,7 @@ static void transport_processing_shutdown(struct se_device *dev)
                                transport_lun_remove_cmd(cmd);
 
                                if (transport_cmd_check_stop(cmd, 1, 0))
-                                       transport_generic_remove(cmd, 0);
+                                       transport_put_cmd(cmd);
                        }
 
                        spin_lock_irqsave(&dev->execute_task_lock, flags);
@@ -5115,7 +5058,7 @@ static void transport_processing_shutdown(struct se_device *dev)
                        transport_lun_remove_cmd(cmd);
 
                        if (transport_cmd_check_stop(cmd, 1, 0))
-                               transport_generic_remove(cmd, 0);
+                               transport_put_cmd(cmd);
                }
 
                spin_lock_irqsave(&dev->execute_task_lock, flags);
@@ -5138,7 +5081,7 @@ static void transport_processing_shutdown(struct se_device *dev)
                } else {
                        transport_lun_remove_cmd(cmd);
                        if (transport_cmd_check_stop(cmd, 1, 0))
-                               transport_generic_remove(cmd, 0);
+                               transport_put_cmd(cmd);
                }
        }
 }
@@ -5213,10 +5156,10 @@ get_cmd:
                        transport_generic_complete_ok(cmd);
                        break;
                case TRANSPORT_REMOVE:
-                       transport_generic_remove(cmd, 0);
+                       transport_put_cmd(cmd);
                        break;
                case TRANSPORT_FREE_CMD_INTR:
-                       transport_generic_free_cmd(cmd, 0, 0);
+                       transport_generic_free_cmd(cmd, 0);
                        break;
                case TRANSPORT_PROCESS_TMR:
                        transport_generic_do_tmr(cmd);