Author: mav
Date: Sat Sep 12 18:29:05 2015
New Revision: 287720
URL: https://svnweb.freebsd.org/changeset/base/287720
Log:
Fix false CTL_UA_RES_RELEASE on secondary HA node.
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c Sat Sep 12 18:00:06 2015 (r287719)
+++ head/sys/cam/ctl/ctl.c Sat Sep 12 18:29:05 2015 (r287720)
@@ -8404,7 +8404,7 @@ ctl_hndl_per_res_out_on_other_sc(union c
struct ctl_lun *lun;
struct ctl_softc *softc;
int i;
- uint32_t targ_lun;
+ uint32_t residx, targ_lun;
softc = control_softc;
targ_lun = msg->hdr.nexus.targ_mapped_lun;
@@ -8420,6 +8420,7 @@ ctl_hndl_per_res_out_on_other_sc(union c
mtx_unlock(&lun->lun_lock);
return;
}
+ residx = ctl_get_initindex(&msg->hdr.nexus);
switch(msg->pr.pr_info.action) {
case CTL_PR_REG_KEY:
ctl_alloc_prkey(lun, msg->pr.pr_info.residx);
@@ -8484,8 +8485,9 @@ ctl_hndl_per_res_out_on_other_sc(union c
if (lun->res_type != SPR_TYPE_EX_AC
&& lun->res_type != SPR_TYPE_WR_EX) {
for (i = softc->init_min; i < softc->init_max; i++)
- if (ctl_get_prkey(lun, i) != 0)
- ctl_est_ua(lun, i, CTL_UA_RES_RELEASE);
+ if (i == residx || ctl_get_prkey(lun, i) == 0)
+ continue;
+ ctl_est_ua(lun, i, CTL_UA_RES_RELEASE);
}
lun->flags &= ~CTL_LUN_PR_RESERVED;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
