Author: mav
Date: Thu Dec 18 08:32:56 2014
New Revision: 275889
URL: https://svnweb.freebsd.org/changeset/base/275889
Log:
MFC r275459: Unify function names after r275458.
Modified:
stable/10/sys/cam/ctl/ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c Thu Dec 18 08:32:06 2014 (r275888)
+++ stable/10/sys/cam/ctl/ctl.c Thu Dec 18 08:32:56 2014 (r275889)
@@ -7908,7 +7908,7 @@ retry:
}
static void
-ctl_set_res_ua(struct ctl_lun *lun, uint32_t residx, ctl_ua_type ua)
+ctl_est_res_ua(struct ctl_lun *lun, uint32_t residx, ctl_ua_type ua)
{
int off = lun->ctl_softc->persis_offset;
@@ -7970,7 +7970,7 @@ ctl_pro_preempt(struct ctl_softc *softc,
continue;
ctl_clr_prkey(lun, i);
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
lun->pr_key_count = 1;
lun->res_type = type;
@@ -8041,7 +8041,7 @@ ctl_pro_preempt(struct ctl_softc *softc,
found = 1;
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
if (!found) {
mtx_unlock(&lun->lun_lock);
@@ -8116,11 +8116,11 @@ ctl_pro_preempt(struct ctl_softc *softc,
if (sa_res_key == ctl_get_prkey(lun, i)) {
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
- ctl_set_res_ua(lun, i,
CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i,
CTL_UA_REG_PREEMPT);
} else if (type != lun->res_type
&& (lun->res_type == SPR_TYPE_WR_EX_RO
|| lun->res_type ==SPR_TYPE_EX_AC_RO)){
- ctl_set_res_ua(lun, i,
CTL_UA_RES_RELEASE);
+ ctl_est_res_ua(lun, i,
CTL_UA_RES_RELEASE);
}
}
lun->res_type = type;
@@ -8159,7 +8159,7 @@ ctl_pro_preempt(struct ctl_softc *softc,
found = 1;
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
if (!found) {
@@ -8215,7 +8215,7 @@ ctl_pro_preempt_other(struct ctl_lun *lu
continue;
ctl_clr_prkey(lun, i);
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
lun->pr_key_count = 1;
@@ -8230,7 +8230,7 @@ ctl_pro_preempt_other(struct ctl_lun *lu
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
}
} else {
@@ -8242,11 +8242,11 @@ ctl_pro_preempt_other(struct ctl_lun *lu
if (sa_res_key == ctl_get_prkey(lun, i)) {
ctl_clr_prkey(lun, i);
lun->pr_key_count--;
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
} else if (msg->pr.pr_info.res_type != lun->res_type
&& (lun->res_type == SPR_TYPE_WR_EX_RO
|| lun->res_type == SPR_TYPE_EX_AC_RO)) {
- ctl_set_res_ua(lun, i, CTL_UA_RES_RELEASE);
+ ctl_est_res_ua(lun, i, CTL_UA_RES_RELEASE);
}
}
lun->res_type = msg->pr.pr_info.res_type;
@@ -8632,7 +8632,7 @@ ctl_persistent_reserve_out(struct ctl_sc
for (i=0; i < 2*CTL_MAX_INITIATORS; i++)
if (ctl_get_prkey(lun, i) != 0) {
ctl_clr_prkey(lun, i);
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
lun->PRGeneration++;
mtx_unlock(&lun->lun_lock);
@@ -8774,7 +8774,7 @@ ctl_hndl_per_res_out_on_other_sc(union c
if (ctl_get_prkey(lun, i) == 0)
continue;
ctl_clr_prkey(lun, i);
- ctl_set_res_ua(lun, i, CTL_UA_REG_PREEMPT);
+ ctl_est_res_ua(lun, i, CTL_UA_REG_PREEMPT);
}
lun->PRGeneration++;
break;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
