diff options
author | Andrey V. Elsukov <ae@FreeBSD.org> | 2012-11-14 17:36:06 +0000 |
---|---|---|
committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2012-11-14 17:36:06 +0000 |
commit | 5cf7ec13f7927af85d005f32dadd90f7b74a3145 (patch) | |
tree | fe7372dc9b27e13f38914dddae5f7b287f081799 /sys/netinet6/scope6.c | |
parent | 6961891ea15a7e79990ee10ea747c512a1f2abe4 (diff) | |
download | src-5cf7ec13f7927af85d005f32dadd90f7b74a3145.tar.gz src-5cf7ec13f7927af85d005f32dadd90f7b74a3145.zip |
if_afdata lock was converted from mutex to rwlock a long ago, so we can
replace IF_AFDATA_LOCK() macro depending to the access type.
Sponsored by: Yandex LLC
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=243031
Diffstat (limited to 'sys/netinet6/scope6.c')
-rw-r--r-- | sys/netinet6/scope6.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c index f8dd8d1bcd4e..1cfe1036d238 100644 --- a/sys/netinet6/scope6.c +++ b/sys/netinet6/scope6.c @@ -121,11 +121,11 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) int error = 0; struct scope6_id *sid = NULL; - IF_AFDATA_LOCK(ifp); + IF_AFDATA_WLOCK(ifp); sid = SID(ifp); if (!sid) { /* paranoid? */ - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_WUNLOCK(ifp); return (EINVAL); } @@ -148,7 +148,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) */ if (i == IPV6_ADDR_SCOPE_INTFACELOCAL && idlist->s6id_list[i] != ifp->if_index) { - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_WUNLOCK(ifp); return (EINVAL); } @@ -160,7 +160,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) * IDs, but we check the consistency for * safety in later use. */ - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_WUNLOCK(ifp); return (EINVAL); } @@ -172,7 +172,7 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) sid->s6id_list[i] = idlist->s6id_list[i]; } } - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_WUNLOCK(ifp); return (error); } @@ -180,18 +180,19 @@ scope6_set(struct ifnet *ifp, struct scope6_id *idlist) int scope6_get(struct ifnet *ifp, struct scope6_id *idlist) { - /* We only need to lock the interface's afdata for SID() to work. */ - IF_AFDATA_LOCK(ifp); - struct scope6_id *sid = SID(ifp); + struct scope6_id *sid; + /* We only need to lock the interface's afdata for SID() to work. */ + IF_AFDATA_RLOCK(ifp); + sid = SID(ifp); if (sid == NULL) { /* paranoid? */ - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_RUNLOCK(ifp); return (EINVAL); } *idlist = *sid; - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_RUNLOCK(ifp); return (0); } @@ -408,7 +409,7 @@ in6_setscope(struct in6_addr *in6, struct ifnet *ifp, u_int32_t *ret_id) u_int32_t zoneid = 0; struct scope6_id *sid; - IF_AFDATA_LOCK(ifp); + IF_AFDATA_RLOCK(ifp); sid = SID(ifp); @@ -425,12 +426,12 @@ in6_setscope(struct in6_addr *in6, struct ifnet *ifp, u_int32_t *ret_id) */ if (IN6_IS_ADDR_LOOPBACK(in6)) { if (!(ifp->if_flags & IFF_LOOPBACK)) { - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_RUNLOCK(ifp); return (EINVAL); } else { if (ret_id != NULL) *ret_id = 0; /* there's no ambiguity */ - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_RUNLOCK(ifp); return (0); } } @@ -457,7 +458,7 @@ in6_setscope(struct in6_addr *in6, struct ifnet *ifp, u_int32_t *ret_id) zoneid = 0; /* XXX: treat as global. */ break; } - IF_AFDATA_UNLOCK(ifp); + IF_AFDATA_RUNLOCK(ifp); if (ret_id != NULL) *ret_id = zoneid; |