From 53ce7911b6f9666eb3d466f81e4e2d0a2467834e Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Fri, 16 Nov 2012 08:06:18 -0800 Subject: [PATCH] --- yaml --- r: 344749 b: refs/heads/master c: d9ed69473a345d69cf15831e8db22f159b13cdd2 h: refs/heads/master i: 344747: 9cb59756e7aa9060fe8a119138a8855050333bd5 v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_transport.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 187d830dfdae..9e3f1d66b16d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06e97b489006f28e23bb028febfa1c01c266d676 +refs/heads/master: d9ed69473a345d69cf15831e8db22f159b13cdd2 diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c index 4b062c81727d..7e7fa58b56ea 100644 --- a/trunk/drivers/target/target_core_transport.c +++ b/trunk/drivers/target/target_core_transport.c @@ -1966,9 +1966,10 @@ static void transport_put_cmd(struct se_cmd *cmd) unsigned long flags; spin_lock_irqsave(&cmd->t_state_lock, flags); - if (atomic_read(&cmd->t_fe_count)) { - if (!atomic_dec_and_test(&cmd->t_fe_count)) - goto out_busy; + if (atomic_read(&cmd->t_fe_count) && + !atomic_dec_and_test(&cmd->t_fe_count)) { + spin_unlock_irqrestore(&cmd->t_state_lock, flags); + return; } if (cmd->transport_state & CMD_T_DEV_ACTIVE) { @@ -1980,8 +1981,6 @@ static void transport_put_cmd(struct se_cmd *cmd) transport_free_pages(cmd); transport_release_cmd(cmd); return; -out_busy: - spin_unlock_irqrestore(&cmd->t_state_lock, flags); } void *transport_kmap_data_sg(struct se_cmd *cmd)