diff options
author | julian <julian@FreeBSD.org> | 2004-08-31 06:12:13 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 2004-08-31 06:12:13 +0000 |
commit | ee753ed190029f2bb1071fa1905073ad15121ae5 (patch) | |
tree | dddf557370c3f26fcb7ce5b74984fd362556bf89 | |
parent | d3a487d5866b728b29cf8da175a0ceae5e01eb2f (diff) | |
download | FreeBSD-src-ee753ed190029f2bb1071fa1905073ad15121ae5.zip FreeBSD-src-ee753ed190029f2bb1071fa1905073ad15121ae5.tar.gz |
Remove sched_free_thread() which was only used
in diagnostics. It has outlived its usefulness and has started
causing panics for people who turn on DIAGNOSTIC, in what is otherwise
good code.
MFC after: 2 days
-rw-r--r-- | sys/alpha/alpha/trap.c | 6 | ||||
-rw-r--r-- | sys/amd64/amd64/trap.c | 6 | ||||
-rw-r--r-- | sys/amd64/ia32/ia32_syscall.c | 3 | ||||
-rw-r--r-- | sys/i386/i386/trap.c | 6 | ||||
-rw-r--r-- | sys/ia64/ia64/trap.c | 10 | ||||
-rw-r--r-- | sys/kern/kern_fork.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_prot.c | 13 | ||||
-rw-r--r-- | sys/kern/subr_trap.c | 3 | ||||
-rw-r--r-- | sys/powerpc/aim/trap.c | 3 | ||||
-rw-r--r-- | sys/powerpc/powerpc/trap.c | 3 | ||||
-rw-r--r-- | sys/sparc64/sparc64/trap.c | 6 | ||||
-rw-r--r-- | sys/sys/ucred.h | 3 |
12 files changed, 0 insertions, 65 deletions
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index 4d3619e..e91bc90 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -591,9 +591,6 @@ out: framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); userret(td, framep, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif } return; @@ -785,9 +782,6 @@ syscall(code, framep) PTRACESTOP_SC(p, td, S_PT_SCX); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index f12b288..d9f8e81 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -471,9 +471,6 @@ user: userret(td, &frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); userout: -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif out: return; } @@ -830,9 +827,6 @@ syscall(frame) PTRACESTOP_SC(p, td, S_PT_SCX); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c index e32cfcd..39eb81a 100644 --- a/sys/amd64/ia32/ia32_syscall.c +++ b/sys/amd64/ia32/ia32_syscall.c @@ -247,9 +247,6 @@ ia32_syscall(struct trapframe frame) */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index fd3c89c..e066417 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -635,9 +635,6 @@ user: userret(td, &frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); userout: -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif out: return; } @@ -1070,9 +1067,6 @@ syscall(frame) PTRACESTOP_SC(p, td, S_PT_SCX); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c index 3a67cff..373ffdb 100644 --- a/sys/ia64/ia64/trap.c +++ b/sys/ia64/ia64/trap.c @@ -901,9 +901,6 @@ out: if (user) { userret(td, tf, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif do_ast(tf); } return; @@ -1072,10 +1069,6 @@ syscall(struct trapframe *tf) PTRACESTOP_SC(p, td, S_PT_SCX); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif - WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); @@ -1248,9 +1241,6 @@ ia32_syscall(struct trapframe *tf) */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 90f13c4..8451861 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -831,9 +831,6 @@ fork_exit(callout, arg, frame) kthread_exit(0); } PROC_UNLOCK(p); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif mtx_assert(&Giant, MA_NOTOWNED); } diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 2a0aafb..28905f2 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1829,19 +1829,6 @@ crdup(struct ucred *cr) return (newcr); } -#ifdef DIAGNOSTIC -void -cred_free_thread(struct thread *td) -{ - struct ucred *cred; - - cred = td->td_ucred; - td->td_ucred = NULL; - if (cred != NULL) - crfree(cred); -} -#endif - /* * Fill in a struct xucred based on a struct ucred. * MPSAFE diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index fc129c4..ccdaa2d 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -261,8 +261,5 @@ ast(struct trapframe *framep) } userret(td, framep, sticks); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif mtx_assert(&Giant, MA_NOTOWNED); } diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c index 2b4a749..52e2a69 100644 --- a/sys/powerpc/aim/trap.c +++ b/sys/powerpc/aim/trap.c @@ -256,9 +256,6 @@ trap(struct trapframe *frame) userret(td, frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif /* DIAGNOSTIC */ } static void diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index 2b4a749..52e2a69 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -256,9 +256,6 @@ trap(struct trapframe *frame) userret(td, frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif /* DIAGNOSTIC */ } static void diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c index 15a7b1e..d5ec2c2 100644 --- a/sys/sparc64/sparc64/trap.c +++ b/sys/sparc64/sparc64/trap.c @@ -290,9 +290,6 @@ trap(struct trapframe *tf) userret(td, tf, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif } else { KASSERT((tf->tf_type & T_KERNEL) != 0, ("trap: kernel trap isn't")); @@ -659,9 +656,6 @@ syscall(struct trapframe *tf) PTRACESTOP_SC(p, td, S_PT_SCX); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 2c2b616..d964de9 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -87,9 +87,6 @@ void change_svgid(struct ucred *newcred, gid_t svgid); void change_svuid(struct ucred *newcred, uid_t svuid); void crcopy(struct ucred *dest, struct ucred *src); struct ucred *crdup(struct ucred *cr); -#ifdef DIAGNOSTIC -void cred_free_thread(struct thread *td); -#endif void cred_update_thread(struct thread *td); void crfree(struct ucred *cr); struct ucred *crget(void); |