iscsi-target: Convert gfp_t parameter to task state bitmask

This patch propigates the use of task state bitmask now used by
percpu_ida_alloc() up the iscsi-target callchain, replacing the
use of GFP_ATOMIC for TASK_RUNNING, and GFP_KERNEL for
TASK_INTERRUPTIBLE.

Also, drop the unnecessary gfp_t parameter to isert_allocate_cmd(),
and just pass TASK_INTERRUPTIBLE into iscsit_allocate_cmd().

Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 421182be6e3f..63bcf69e9fe2 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1028,13 +1028,13 @@ isert_rx_login_req(struct iser_rx_desc *rx_desc, int rx_buflen,
 }
 
 static struct iscsi_cmd
-*isert_allocate_cmd(struct iscsi_conn *conn, gfp_t gfp)
+*isert_allocate_cmd(struct iscsi_conn *conn)
 {
         struct isert_conn *isert_conn = (struct isert_conn *)conn->context;
         struct isert_cmd *isert_cmd;
         struct iscsi_cmd *cmd;
 
-        cmd = iscsit_allocate_cmd(conn, gfp);
+        cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE);
         if (!cmd) {
                 pr_err("Unable to allocate iscsi_cmd + isert_cmd\n");
                 return NULL;
@@ -1223,7 +1223,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
 
         switch (opcode) {
         case ISCSI_OP_SCSI_CMD:
-                cmd = isert_allocate_cmd(conn, GFP_KERNEL);
+                cmd = isert_allocate_cmd(conn);
                 if (!cmd)
                         break;
 
@@ -1237,7 +1237,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                                         rx_desc, (unsigned char *)hdr);
                 break;
         case ISCSI_OP_NOOP_OUT:
-                cmd = isert_allocate_cmd(conn, GFP_KERNEL);
+                cmd = isert_allocate_cmd(conn);
                 if (!cmd)
                         break;
 
@@ -1250,7 +1250,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                                                 (unsigned char *)hdr);
                 break;
         case ISCSI_OP_SCSI_TMFUNC:
-                cmd = isert_allocate_cmd(conn, GFP_KERNEL);
+                cmd = isert_allocate_cmd(conn);
                 if (!cmd)
                         break;
 
@@ -1258,7 +1258,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                                                 (unsigned char *)hdr);
                 break;
         case ISCSI_OP_LOGOUT:
-                cmd = isert_allocate_cmd(conn, GFP_KERNEL);
+                cmd = isert_allocate_cmd(conn);
                 if (!cmd)
                         break;
 
@@ -1269,7 +1269,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc,
                                                     HZ);
                 break;
         case ISCSI_OP_TEXT:
-                cmd = isert_allocate_cmd(conn, GFP_KERNEL);
+                cmd = isert_allocate_cmd(conn);
                 if (!cmd)
                         break;