From 5669cfde800175bbd2b8b3aa1c84d88fe4ec5cc0 Mon Sep 17 00:00:00 2001 From: rwatson Date: Sat, 5 Oct 2002 17:18:43 +0000 Subject: Sync to MAC tree: use 'flag' instead of 'how' for mac_init_mbuf(); remove a slightly less than useful comment. --- sys/kern/kern_mac.c | 6 +++--- sys/security/mac/mac_framework.c | 6 +++--- sys/security/mac/mac_internal.h | 6 +++--- sys/security/mac/mac_net.c | 6 +++--- sys/security/mac/mac_pipe.c | 6 +++--- sys/security/mac/mac_process.c | 6 +++--- sys/security/mac/mac_syscalls.c | 6 +++--- sys/security/mac/mac_system.c | 6 +++--- sys/security/mac/mac_vfs.c | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'sys') diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index d96abb2..8df223d 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index d96abb2..8df223d 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac) } int -mac_init_mbuf(struct mbuf *m, int how) +mac_init_mbuf(struct mbuf *m, int flag) { KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); #ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); #endif -- cgit v1.1