target: replace various cmd flags with a transport state

Replace various atomic_ts used as flags in struct se_cmd with a single
transport_state bitmap that requires t_state_lock to be held for modifications.

In the target core that assumption generally is true, but some recently added
code in the SRP target had to grow new lock calls.  I can't say I like the way
how it messes with the command state directly, but let's leave that for later.

(Re-add missing ib_srpt.c changes that nab dropped..)

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

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 2b73d43cd691..e1e6b5b03c96 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1378,7 +1378,9 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
                 break;
         case SRPT_STATE_NEED_DATA:
                 /* DMA_TO_DEVICE (write) - RDMA read error. */
-                atomic_set(&ioctx->cmd.transport_lun_stop, 1);
+                spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
+                ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
+                spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
                 transport_generic_handle_data(&ioctx->cmd);
                 break;
         case SRPT_STATE_CMD_RSP_SENT:
@@ -1387,7 +1389,9 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
                  * not been received in time.
                  */
                 srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);
-                atomic_set(&ioctx->cmd.transport_lun_stop, 1);
+                spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
+                ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
+                spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
                 kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);
                 break;
         case SRPT_STATE_MGMT_RSP_SENT:
@@ -1494,6 +1498,7 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,
 {
         struct se_cmd *cmd;
         enum srpt_command_state state;
+        unsigned long flags;
 
         cmd = &ioctx->cmd;
         state = srpt_get_cmd_state(ioctx);
@@ -1513,7 +1518,9 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,
                                __func__, __LINE__, state);
                 break;
         case SRPT_RDMA_WRITE_LAST:
-                atomic_set(&ioctx->cmd.transport_lun_stop, 1);
+                spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
+                ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
+                spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
                 break;
         default:
                 printk(KERN_ERR "%s[%d]: opcode = %u\n", __func__,