RDMA/iser: Remove in_interrupt() usage

[sfrench/cifs-2.6.git] / drivers / infiniband / ulp / iser / iscsi_iser.c

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 1a459b35000cc188dbfd5db27d9bd2ca90fa61f6..4792b9bf400ffd18ca3296a577403d6cafbadf68 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -187,23 +187,14 @@ iser_initialize_task_headers(struct iscsi_task *task,
        struct iser_device *device = iser_conn->ib_conn.device;
        struct iscsi_iser_task *iser_task = task->dd_data;
        u64 dma_addr;
-       const bool mgmt_task = !task->sc && !in_interrupt();
-       int ret = 0;
 
-       if (unlikely(mgmt_task))
-               mutex_lock(&iser_conn->state_mutex);
-
-       if (unlikely(iser_conn->state != ISER_CONN_UP)) {
-               ret = -ENODEV;
-               goto out;
-       }
+       if (unlikely(iser_conn->state != ISER_CONN_UP))
+               return -ENODEV;
 
        dma_addr = ib_dma_map_single(device->ib_device, (void *)tx_desc,
                                ISER_HEADERS_LEN, DMA_TO_DEVICE);
-       if (ib_dma_mapping_error(device->ib_device, dma_addr)) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (ib_dma_mapping_error(device->ib_device, dma_addr))
+               return -ENOMEM;
 
        tx_desc->inv_wr.next = NULL;
        tx_desc->reg_wr.wr.next = NULL;
@@ -214,11 +205,8 @@ iser_initialize_task_headers(struct iscsi_task *task,
        tx_desc->tx_sg[0].lkey   = device->pd->local_dma_lkey;
 
        iser_task->iser_conn = iser_conn;
-out:
-       if (unlikely(mgmt_task))
-               mutex_unlock(&iser_conn->state_mutex);
 
-       return ret;
+       return 0;
 }
 
 /**