From 8b3a843438920921b0636d71e0d0c2c7a7c6b261 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 28 Oct 2002 18:53:53 +0000 Subject: [PATCH] An inappropriate ASSERT slipped in during the recent merge of the reboot checking; remove. --- sys/kern/kern_mac.c | 2 -- sys/security/mac/mac_framework.c | 2 -- sys/security/mac/mac_internal.h | 2 -- sys/security/mac/mac_net.c | 2 -- sys/security/mac/mac_pipe.c | 2 -- sys/security/mac/mac_process.c | 2 -- sys/security/mac/mac_syscalls.c | 2 -- sys/security/mac/mac_system.c | 2 -- sys/security/mac/mac_vfs.c | 2 -- 9 files changed, 18 deletions(-) diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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 b99c64496302..bb2e3ef78b4c 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);