diff options
author | Joern Engel <joern@logfs.org> | 2014-09-02 17:49:47 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2014-09-17 16:19:08 -0400 |
commit | fbecb6596a80554423d00aba92f2752a2ee0a62d (patch) | |
tree | fb59df8b554c1979ae4fafa9c52b11bec9b687eb | |
parent | c6c2a3de36b1e45841888e27bc2f85ef4e471ad3 (diff) |
iscsi-target: remove unused debug code
Last user of buf was removed with c6037cc546ca. While at it,
free_cpumask_var() handles a NULL argument just fine, so remove the
conditionals.
Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 6 | ||||
-rw-r--r-- | drivers/target/iscsi/iscsi_target_login.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 1f4c794f5fcc..30f4a7d42e32 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -3709,7 +3709,6 @@ static inline void iscsit_thread_check_cpumask( | |||
3709 | struct task_struct *p, | 3709 | struct task_struct *p, |
3710 | int mode) | 3710 | int mode) |
3711 | { | 3711 | { |
3712 | char buf[128]; | ||
3713 | /* | 3712 | /* |
3714 | * mode == 1 signals iscsi_target_tx_thread() usage. | 3713 | * mode == 1 signals iscsi_target_tx_thread() usage. |
3715 | * mode == 0 signals iscsi_target_rx_thread() usage. | 3714 | * mode == 0 signals iscsi_target_rx_thread() usage. |
@@ -3728,8 +3727,6 @@ static inline void iscsit_thread_check_cpumask( | |||
3728 | * both TX and RX kthreads are scheduled to run on the | 3727 | * both TX and RX kthreads are scheduled to run on the |
3729 | * same CPU. | 3728 | * same CPU. |
3730 | */ | 3729 | */ |
3731 | memset(buf, 0, 128); | ||
3732 | cpumask_scnprintf(buf, 128, conn->conn_cpumask); | ||
3733 | set_cpus_allowed_ptr(p, conn->conn_cpumask); | 3730 | set_cpus_allowed_ptr(p, conn->conn_cpumask); |
3734 | } | 3731 | } |
3735 | 3732 | ||
@@ -4326,8 +4323,7 @@ int iscsit_close_connection( | |||
4326 | if (conn->conn_tx_hash.tfm) | 4323 | if (conn->conn_tx_hash.tfm) |
4327 | crypto_free_hash(conn->conn_tx_hash.tfm); | 4324 | crypto_free_hash(conn->conn_tx_hash.tfm); |
4328 | 4325 | ||
4329 | if (conn->conn_cpumask) | 4326 | free_cpumask_var(conn->conn_cpumask); |
4330 | free_cpumask_var(conn->conn_cpumask); | ||
4331 | 4327 | ||
4332 | kfree(conn->conn_ops); | 4328 | kfree(conn->conn_ops); |
4333 | conn->conn_ops = NULL; | 4329 | conn->conn_ops = NULL; |
diff --git a/drivers/target/iscsi/iscsi_target_login.c b/drivers/target/iscsi/iscsi_target_login.c index 5e71ac609418..b1ae5cbe70f8 100644 --- a/drivers/target/iscsi/iscsi_target_login.c +++ b/drivers/target/iscsi/iscsi_target_login.c | |||
@@ -1190,8 +1190,7 @@ old_sess_out: | |||
1190 | if (!IS_ERR(conn->conn_tx_hash.tfm)) | 1190 | if (!IS_ERR(conn->conn_tx_hash.tfm)) |
1191 | crypto_free_hash(conn->conn_tx_hash.tfm); | 1191 | crypto_free_hash(conn->conn_tx_hash.tfm); |
1192 | 1192 | ||
1193 | if (conn->conn_cpumask) | 1193 | free_cpumask_var(conn->conn_cpumask); |
1194 | free_cpumask_var(conn->conn_cpumask); | ||
1195 | 1194 | ||
1196 | kfree(conn->conn_ops); | 1195 | kfree(conn->conn_ops); |
1197 | 1196 | ||