svn commit: r254774 - head/sys/net

[Andre Oppermann]

Author: andre
Date: Sat Aug 24 11:24:15 2013
New Revision: 254774
URL: http://svnweb.freebsd.org/changeset/base/254774

Log:
  ename PFIL_LIST_[UN]LOCK() to PFIL_HEADLIST_[UN]LOCK() to avoid
  confusion with the pfil_head chain locking macros.

Modified:
  head/sys/net/pfil.c
  head/sys/net/pfil.h

Modified: head/sys/net/pfil.c
==============================================================================
--- head/sys/net/pfil.c Sat Aug 24 11:17:25 2013        (r254773)
+++ head/sys/net/pfil.c Sat Aug 24 11:24:15 2013        (r254774)
@@ -173,11 +173,11 @@ pfil_head_register(struct pfil_head *ph)
 {
        struct pfil_head *lph;
 
-       PFIL_LIST_LOCK();
+       PFIL_HEADLIST_LOCK();
        LIST_FOREACH(lph, &V_pfil_head_list, ph_list) {
                if (ph->ph_type == lph->ph_type &&
                    ph->ph_un.phu_val == lph->ph_un.phu_val) {
-                       PFIL_LIST_UNLOCK();
+                       PFIL_HEADLIST_UNLOCK();
                        return (EEXIST);
                }
        }
@@ -186,7 +186,7 @@ pfil_head_register(struct pfil_head *ph)
        TAILQ_INIT(&ph->ph_in);
        TAILQ_INIT(&ph->ph_out);
        LIST_INSERT_HEAD(&V_pfil_head_list, ph, ph_list);
-       PFIL_LIST_UNLOCK();
+       PFIL_HEADLIST_UNLOCK();
        return (0);
 }
 
@@ -200,9 +200,9 @@ pfil_head_unregister(struct pfil_head *p
 {
        struct packet_filter_hook *pfh, *pfnext;
                
-       PFIL_LIST_LOCK();
+       PFIL_HEADLIST_LOCK();
        LIST_REMOVE(ph, ph_list);
-       PFIL_LIST_UNLOCK();
+       PFIL_HEADLIST_UNLOCK();
        TAILQ_FOREACH_SAFE(pfh, &ph->ph_in, pfil_chain, pfnext)
                free(pfh, M_IFADDR);
        TAILQ_FOREACH_SAFE(pfh, &ph->ph_out, pfil_chain, pfnext)
@@ -219,11 +219,11 @@ pfil_head_get(int type, u_long val)
 {
        struct pfil_head *ph;
 
-       PFIL_LIST_LOCK();
+       PFIL_HEADLIST_LOCK();
        LIST_FOREACH(ph, &V_pfil_head_list, ph_list)
                if (ph->ph_type == type && ph->ph_un.phu_val == val)
                        break;
-       PFIL_LIST_UNLOCK();
+       PFIL_HEADLIST_UNLOCK();
        return (ph);
 }
 

Modified: head/sys/net/pfil.h
==============================================================================
--- head/sys/net/pfil.h Sat Aug 24 11:17:25 2013        (r254773)
+++ head/sys/net/pfil.h Sat Aug 24 11:24:15 2013        (r254774)
@@ -138,7 +138,9 @@ int pfil_wowned(struct pfil_head *ph);
 #define        PFIL_RUNLOCK(p, t)      rm_runlock((p)->ph_plock, (t))
 #define        PFIL_WUNLOCK(p)         rm_wunlock((p)->ph_plock)
 #define        PFIL_WOWNED(p)          rm_wowned((p)->ph_plock)
-#define        PFIL_LIST_LOCK()        mtx_lock(&pfil_global_lock)
-#define        PFIL_LIST_UNLOCK()      mtx_unlock(&pfil_global_lock)
+
+/* Internal locking macros for global/vnet pfil_head_list. */
+#define        PFIL_HEADLIST_LOCK()    mtx_lock(&pfil_global_lock)
+#define        PFIL_HEADLIST_UNLOCK()  mtx_unlock(&pfil_global_lock)
 
 #endif /* _NET_PFIL_H_ */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"