summaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2012-11-06 15:46:25 -0800
committerNicholas Bellinger <nab@linux-iscsi.org>2012-11-07 20:12:06 -0800
commitbb7a8c8eb9678666fb05f3bc542581365399a161 (patch)
tree9b4b406da47b94b363f06039b4a42013ef10c108 /drivers/target
parentb69c1fcf0a7cb2b7dff12ce4e8506b395431a52c (diff)
downloadop-kernel-dev-bb7a8c8eb9678666fb05f3bc542581365399a161.zip
op-kernel-dev-bb7a8c8eb9678666fb05f3bc542581365399a161.tar.gz
target: Fix exception path pr_reg put regression for PR RELEASE
Fix a regression bug in core_scsi3_emulate_pro_release() where should still be getting released via core_scsi3_put_pr_reg() during No persistent reservation, with returing GOOD status. Use goto statement here to follow converted code from hch. Cc: Christoph Hellwig <hch@lst.de> Cc: Roland Dreier <roland@purestorage.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/target_core_pr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index ffbe0ea..d7101a4 100644
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -2604,7 +2604,7 @@ core_scsi3_emulate_pro_release(struct se_cmd *cmd, int type, int scope,
* No persistent reservation, return GOOD status.
*/
spin_unlock(&dev->dev_reservation_lock);
- return 0;
+ goto out_put_pr_reg;
}
if ((pr_res_holder->pr_res_type == PR_TYPE_WRITE_EXCLUSIVE_ALLREG) ||
(pr_res_holder->pr_res_type == PR_TYPE_EXCLUSIVE_ACCESS_ALLREG))
OpenPOWER on IntegriCloud