From f9477570ec8b415fc557b47f7f7d2b543aa65a0e Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Wed, 3 Dec 2014 15:19:38 +0000 Subject: [PATCH] Unify function names after r275458. MFC after: 1 month --- sys/cam/ctl/ctl.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 290ebefcf136..fdbb01f63aae 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -7906,7 +7906,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; @@ -7968,7 +7968,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key, 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; @@ -8039,7 +8039,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key, 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); @@ -8114,11 +8114,11 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key, 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; @@ -8157,7 +8157,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key, 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) { @@ -8213,7 +8213,7 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_ha_msg *msg) 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; @@ -8228,7 +8228,7 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_ha_msg *msg) 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 { @@ -8240,11 +8240,11 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_ha_msg *msg) 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; @@ -8630,7 +8630,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio) 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); @@ -8772,7 +8772,7 @@ ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg) 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;