diff options
| author | rwatson <rwatson@FreeBSD.org> | 2002-10-28 18:53:53 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2002-10-28 18:53:53 +0000 |
| commit | 9ae04d1a068e7f6ab4b535ccd36b62d81cd9bc7b (patch) | |
| tree | 5f6e7ab4601c252cdb7827a88c380f0eb77ee731 /sys | |
| parent | 7895420367ef43fd36827519b91a9530712df8aa (diff) | |
| download | FreeBSD-src-9ae04d1a068e7f6ab4b535ccd36b62d81cd9bc7b.zip FreeBSD-src-9ae04d1a068e7f6ab4b535ccd36b62d81cd9bc7b.tar.gz | |
An inappropriate ASSERT slipped in during the recent merge of the
reboot checking; remove.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_mac.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_framework.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_internal.h | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_net.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_pipe.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_process.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_syscalls.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_system.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_vfs.c | 2 |
9 files changed, 0 insertions, 18 deletions
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index b99c644..bb2e3ef 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index b99c644..bb2e3ef 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -3014,8 +3014,6 @@ mac_check_system_reboot(struct ucred *cred, int howto) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_system_reboot"); - if (!mac_enforce_system) return (0); |
