Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-block.git] / drivers / target / iscsi / iscsi_target.c

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index d425cc386d878efa16a6935a0862ac746675661d..e368f038ff5c0f36ce8c6e858a34e24465d68505 100644 (file)
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -3596,10 +3596,7 @@ static int iscsit_send_reject(
 void iscsit_thread_get_cpumask(struct iscsit_conn *conn)
 {
        int ord, cpu;
-       cpumask_t conn_allowed_cpumask;
-
-       cpumask_and(&conn_allowed_cpumask, iscsit_global->allowed_cpumask,
-                   cpu_online_mask);
+       cpumask_var_t conn_allowed_cpumask;
 
        /*
         * bitmap_id is assigned from iscsit_global->ts_bitmap from
@@ -3609,13 +3606,28 @@ void iscsit_thread_get_cpumask(struct iscsit_conn *conn)
         * iSCSI connection's RX/TX threads will be scheduled to
         * execute upon.
         */
-       cpumask_clear(conn->conn_cpumask);
-       ord = conn->bitmap_id % cpumask_weight(&conn_allowed_cpumask);
-       for_each_cpu(cpu, &conn_allowed_cpumask) {
-               if (ord-- == 0) {
-                       cpumask_set_cpu(cpu, conn->conn_cpumask);
-                       return;
+       if (!zalloc_cpumask_var(&conn_allowed_cpumask, GFP_KERNEL)) {
+               ord = conn->bitmap_id % cpumask_weight(cpu_online_mask);
+               for_each_online_cpu(cpu) {
+                       if (ord-- == 0) {
+                               cpumask_set_cpu(cpu, conn->conn_cpumask);
+                               return;
+                       }
+               }
+       } else {
+               cpumask_and(conn_allowed_cpumask, iscsit_global->allowed_cpumask,
+                       cpu_online_mask);
+
+               cpumask_clear(conn->conn_cpumask);
+               ord = conn->bitmap_id % cpumask_weight(conn_allowed_cpumask);
+               for_each_cpu(cpu, conn_allowed_cpumask) {
+                       if (ord-- == 0) {
+                               cpumask_set_cpu(cpu, conn->conn_cpumask);
+                               free_cpumask_var(conn_allowed_cpumask);
+                               return;
+                       }
                }
+               free_cpumask_var(conn_allowed_cpumask);
        }
        /*
         * This should never be reached..