diff options
author | Roland Dreier <roland@purestorage.com> | 2012-11-16 11:06:18 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-11-28 01:49:18 -0500 |
commit | d9ed69473a345d69cf15831e8db22f159b13cdd2 (patch) | |
tree | 57b5dce87052c09a256242b2b56d66d603eca6fe | |
parent | 06e97b489006f28e23bb028febfa1c01c266d676 (diff) |
target: Clean up logic in transport_put_cmd()
No need to have a goto where a return is clearer.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@risingtidesystems.com>
-rw-r--r-- | drivers/target/target_core_transport.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 4b062c81727d..7e7fa58b56ea 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -1966,9 +1966,10 @@ static void transport_put_cmd(struct se_cmd *cmd) | |||
1966 | unsigned long flags; | 1966 | unsigned long flags; |
1967 | 1967 | ||
1968 | spin_lock_irqsave(&cmd->t_state_lock, flags); | 1968 | spin_lock_irqsave(&cmd->t_state_lock, flags); |
1969 | if (atomic_read(&cmd->t_fe_count)) { | 1969 | if (atomic_read(&cmd->t_fe_count) && |
1970 | if (!atomic_dec_and_test(&cmd->t_fe_count)) | 1970 | !atomic_dec_and_test(&cmd->t_fe_count)) { |
1971 | goto out_busy; | 1971 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); |
1972 | return; | ||
1972 | } | 1973 | } |
1973 | 1974 | ||
1974 | if (cmd->transport_state & CMD_T_DEV_ACTIVE) { | 1975 | if (cmd->transport_state & CMD_T_DEV_ACTIVE) { |
@@ -1980,8 +1981,6 @@ static void transport_put_cmd(struct se_cmd *cmd) | |||
1980 | transport_free_pages(cmd); | 1981 | transport_free_pages(cmd); |
1981 | transport_release_cmd(cmd); | 1982 | transport_release_cmd(cmd); |
1982 | return; | 1983 | return; |
1983 | out_busy: | ||
1984 | spin_unlock_irqrestore(&cmd->t_state_lock, flags); | ||
1985 | } | 1984 | } |
1986 | 1985 | ||
1987 | void *transport_kmap_data_sg(struct se_cmd *cmd) | 1986 | void *transport_kmap_data_sg(struct se_cmd *cmd) |