d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 'MPSAFE' annotations from the comments above most system calls: all

Browse Source 
system calls now enter without Giant held, and then in some cases, acquire
Giant explicitly.

Remove a number of other MPSAFE annotations in the credential code and
tweak one or two other adjacent comments.
This commit is contained in:
Robert Watson 2007-03-04 22:36:48 +00:00
parent 9f3cef9108
commit 0c14ff0eb5
34 changed files with 38 additions and 694 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_acct.c
View File

@ -182,10 +182,8 @@ SYSCTL_INT(_kern, OID_AUTO, acct_suspended, CTLFLAG_RD, &acct_suspended, 0,
"Accounting suspended or not");
/*
* Accounting system call. Written based on the specification and
* previous implementation done by Mark Tinguely.
*
* MPSAFE
* Accounting system call. Written based on the specification and previous
* implementation done by Mark Tinguely.
*/
int
acct(struct thread *td, struct acct_args *uap)

30
sys/kern/kern_acl.c
View File

@ -185,8 +185,6 @@ vacl_aclcheck(struct thread *td, struct vnode *vp, acl_type_t type,
/*
* Given a file path, get an ACL for it
*
* MPSAFE
*/
int
__acl_get_file(struct thread *td, struct __acl_get_file_args *uap)
@ -207,8 +205,6 @@ __acl_get_file(struct thread *td, struct __acl_get_file_args *uap)
/*
* Given a file path, get an ACL for it; don't follow links.
*
* MPSAFE
*/
int
__acl_get_link(struct thread *td, struct __acl_get_link_args *uap)
@ -228,9 +224,7 @@ __acl_get_link(struct thread *td, struct __acl_get_link_args *uap)
}
/*
* Given a file path, set an ACL for it
*
* MPSAFE
* Given a file path, set an ACL for it.
*/
int
__acl_set_file(struct thread *td, struct __acl_set_file_args *uap)
@ -251,8 +245,6 @@ __acl_set_file(struct thread *td, struct __acl_set_file_args *uap)
/*
* Given a file path, set an ACL for it; don't follow links.
*
* MPSAFE
*/
int
__acl_set_link(struct thread *td, struct __acl_set_link_args *uap)
@ -273,8 +265,6 @@ __acl_set_link(struct thread *td, struct __acl_set_link_args *uap)
/*
* Given a file descriptor, get an ACL for it
*
* MPSAFE
*/
int
__acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap)
@ -294,8 +284,6 @@ __acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap)
/*
* Given a file descriptor, set an ACL for it
*
* MPSAFE
*/
int
__acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap)
@ -315,8 +303,6 @@ __acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap)
/*
* Given a file path, delete an ACL from it.
*
* MPSAFE
*/
int
__acl_delete_file(struct thread *td, struct __acl_delete_file_args *uap)
@ -337,8 +323,6 @@ __acl_delete_file(struct thread *td, struct __acl_delete_file_args *uap)
/*
* Given a file path, delete an ACL from it; don't follow links.
*
* MPSAFE
*/
int
__acl_delete_link(struct thread *td, struct __acl_delete_link_args *uap)
@ -359,8 +343,6 @@ __acl_delete_link(struct thread *td, struct __acl_delete_link_args *uap)
/*
* Given a file path, delete an ACL from it.
*
* MPSAFE
*/
int
__acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap)
@ -379,9 +361,7 @@ __acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap)
}
/*
* Given a file path, check an ACL for it
*
* MPSAFE
* Given a file path, check an ACL for it.
*/
int
__acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap)
@ -402,8 +382,6 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap)
/*
* Given a file path, check an ACL for it; don't follow links.
*
* MPSAFE
*/
int
__acl_aclcheck_link(struct thread *td, struct __acl_aclcheck_link_args *uap)
@ -423,9 +401,7 @@ __acl_aclcheck_link(struct thread *td, struct __acl_aclcheck_link_args *uap)
}
/*
* Given a file descriptor, check an ACL for it
*
* MPSAFE
* Given a file descriptor, check an ACL for it.
*/
int
__acl_aclcheck_fd(struct thread *td, struct __acl_aclcheck_fd_args *uap)

6
sys/kern/kern_context.c
View File

@ -58,9 +58,6 @@ struct swapcontext_args {
}
#endif
/*
* MPSAFE
*/
int
getcontext(struct thread *td, struct getcontext_args *uap)
{
@ -79,9 +76,6 @@ getcontext(struct thread *td, struct getcontext_args *uap)
return (ret);
}
/*
* MPSAFE
*/
int
setcontext(struct thread *td, struct setcontext_args *uap)
{

30
sys/kern/kern_descrip.c
View File

@ -247,9 +247,6 @@ struct getdtablesize_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getdtablesize(struct thread *td, struct getdtablesize_args *uap)
@ -275,9 +272,6 @@ struct dup2_args {
u_int to;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
dup2(struct thread *td, struct dup2_args *uap)
@ -295,9 +289,6 @@ struct dup_args {
u_int fd;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
dup(struct thread *td, struct dup_args *uap)
@ -316,9 +307,6 @@ struct fcntl_args {
long arg;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
fcntl(struct thread *td, struct fcntl_args *uap)
@ -965,9 +953,6 @@ struct close_args {
int fd;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
close(td, uap)
@ -1048,9 +1033,6 @@ struct ofstat_args {
struct ostat *sb;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
ofstat(struct thread *td, struct ofstat_args *uap)
@ -1077,9 +1059,6 @@ struct fstat_args {
struct stat *sb;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
fstat(struct thread *td, struct fstat_args *uap)
@ -1120,9 +1099,6 @@ struct nfstat_args {
struct nstat *sb;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
nfstat(struct thread *td, struct nfstat_args *uap)
@ -1148,9 +1124,6 @@ struct fpathconf_args {
int name;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
fpathconf(struct thread *td, struct fpathconf_args *uap)
@ -2223,9 +2196,6 @@ struct flock_args {
int how;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
flock(struct thread *td, struct flock_args *uap)

6
sys/kern/kern_event.c
View File

@ -506,9 +506,6 @@ filt_timer(struct knote *kn, long hint)
return (kn->kn_data != 0);
}
/*
* MPSAFE
*/
int
kqueue(struct thread *td, struct kqueue_args *uap)
{
@ -557,9 +554,6 @@ struct kevent_args {
const struct timespec *timeout;
};
#endif
/*
* MPSAFE
*/
int
kevent(struct thread *td, struct kevent_args *uap)
{

8
sys/kern/kern_exec.c
View File

@ -168,9 +168,6 @@ struct execve_args {
};
#endif
/*
* MPSAFE
*/
int
execve(td, uap)
struct thread *td;
@ -199,9 +196,6 @@ struct __mac_execve_args {
};
#endif
/*
* MPSAFE
*/
int
__mac_execve(td, uap)
struct thread *td;
@ -277,8 +271,6 @@ kern_execve(td, args, mac_p)
/*
* In-kernel implementation of execve(). All arguments are assumed to be
* userspace pointers from the passed thread.
*
* MPSAFE
*/
static int
do_execve(td, args, mac_p)

9
sys/kern/kern_exit.c
View File

@ -91,8 +91,6 @@ void (*nlminfo_release_p)(struct proc *p);
/*
* exit --
* Death of process.
*
* MPSAFE
*/
void
sys_exit(struct thread *td, struct sys_exit_args *uap)
@ -553,9 +551,6 @@ struct abort2_args {
};
#endif
/*
* MPSAFE.
*/
int
abort2(struct thread *td, struct abort2_args *uap)
{
@ -628,8 +623,6 @@ abort2(struct thread *td, struct abort2_args *uap)
#ifdef COMPAT_43
/*
* The dirty work is handled by kern_wait().
*
* MPSAFE.
*/
int
owait(struct thread *td, struct owait_args *uap __unused)
@ -645,8 +638,6 @@ owait(struct thread *td, struct owait_args *uap __unused)
/*
* The dirty work is handled by kern_wait().
*
* MPSAFE.
*/
int
wait4(struct thread *td, struct wait_args *uap)

9
sys/kern/kern_fork.c
View File

@ -82,9 +82,6 @@ struct fork_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
fork(td, uap)
@ -102,9 +99,6 @@ fork(td, uap)
return (error);
}
/*
* MPSAFE
*/
/* ARGSUSED */
int
vfork(td, uap)
@ -122,9 +116,6 @@ vfork(td, uap)
return (error);
}
/*
* MPSAFE
*/
int
rfork(td, uap)
struct thread *td;

4
sys/kern/kern_jail.c
View File

@ -94,8 +94,6 @@ init_prison(void *data __unused)
SYSINIT(prison, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_prison, NULL);
/*
* MPSAFE
*
* struct jail_args {
* struct jail *jail;
* };
@ -184,8 +182,6 @@ jail(struct thread *td, struct jail_args *uap)
}
/*
* MPSAFE
*
* struct jail_attach_args {
* int jid;
* };

10
sys/kern/kern_ktrace.c
View File

@ -373,9 +373,6 @@ ktr_freerequest(struct ktr_request *req)
mtx_unlock(&ktrace_mtx);
}
/*
* MPSAFE
*/
void
ktrsyscall(code, narg, args)
int code, narg;
@ -407,9 +404,6 @@ ktrsyscall(code, narg, args)
ktr_submitrequest(curthread, req);
}
/*
* MPSAFE
*/
void
ktrsysret(code, error, retval)
int code, error;
@ -564,8 +558,6 @@ ktrcsw(out, user)
/*
* ktrace system call
*
* MPSAFE
*/
#ifndef _SYS_SYSPROTO_H_
struct ktrace_args {
@ -739,8 +731,6 @@ ktrace(td, uap)
/*
* utrace system call
*
* MPSAFE
*/
/* ARGSUSED */
int

27
sys/kern/kern_linker.c
View File

@ -841,9 +841,6 @@ linker_ddb_symbol_values(c_linker_sym_t sym, linker_symval_t *symval)
/*
* Syscalls.
*/
/*
* MPSAFE
*/
int
kern_kldload(struct thread *td, const char *file, int *fileid)
{
@ -909,9 +906,6 @@ kldload(struct thread *td, struct kldload_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
kern_kldunload(struct thread *td, int fileid, int flags)
{
@ -960,9 +954,6 @@ kern_kldunload(struct thread *td, int fileid, int flags)
return (error);
}
/*
* MPSAFE
*/
int
kldunload(struct thread *td, struct kldunload_args *uap)
{
@ -970,9 +961,6 @@ kldunload(struct thread *td, struct kldunload_args *uap)
return (kern_kldunload(td, uap->fileid, LINKER_UNLOAD_NORMAL));
}
/*
* MPSAFE
*/
int
kldunloadf(struct thread *td, struct kldunloadf_args *uap)
{
@ -983,9 +971,6 @@ kldunloadf(struct thread *td, struct kldunloadf_args *uap)
return (kern_kldunload(td, uap->fileid, uap->flags));
}
/*
* MPSAFE
*/
int
kldfind(struct thread *td, struct kldfind_args *uap)
{
@ -1019,9 +1004,6 @@ kldfind(struct thread *td, struct kldfind_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
kldnext(struct thread *td, struct kldnext_args *uap)
{
@ -1059,9 +1041,6 @@ kldnext(struct thread *td, struct kldnext_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
kldstat(struct thread *td, struct kldstat_args *uap)
{
@ -1106,9 +1085,6 @@ kldstat(struct thread *td, struct kldstat_args *uap)
return (copyout(&stat, uap->stat, sizeof(struct kld_file_stat)));
}
/*
* MPSAFE
*/
int
kldfirstmod(struct thread *td, struct kldfirstmod_args *uap)
{
@ -1138,9 +1114,6 @@ kldfirstmod(struct thread *td, struct kldfirstmod_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
kldsym(struct thread *td, struct kldsym_args *uap)
{

15
sys/kern/kern_module.c
View File

@ -280,9 +280,6 @@ module_file(module_t mod)
/*
* Syscalls.
*/
/*
* MPSAFE
*/
int
modnext(struct thread *td, struct modnext_args *uap)
{
@ -314,9 +311,6 @@ modnext(struct thread *td, struct modnext_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
modfnext(struct thread *td, struct modfnext_args *uap)
{
@ -347,9 +341,6 @@ struct module_stat_v1 {
int id;
};
/*
* MPSAFE
*/
int
modstat(struct thread *td, struct modstat_args *uap)
{
@ -403,9 +394,6 @@ modstat(struct thread *td, struct modstat_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
modfind(struct thread *td, struct modfind_args *uap)
{
@ -447,9 +435,6 @@ struct module_stat32 {
modspecific32_t data;
};
/*
* MPSAFE
*/
int
freebsd32_modstat(struct thread *td, struct freebsd32_modstat_args *uap)
{

6
sys/kern/kern_ntptime.c
View File

@ -307,9 +307,6 @@ struct ntp_adjtime_args {
};
#endif
/*
* MPSAFE
*/
int
ntp_adjtime(struct thread *td, struct ntp_adjtime_args *uap)
{
@ -927,9 +924,6 @@ struct adjtime_args {
struct timeval *olddelta;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
adjtime(struct thread *td, struct adjtime_args *uap)

100
sys/kern/kern_prot.c
View File

@ -80,9 +80,6 @@ struct getpid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getpid(struct thread *td, struct getpid_args *uap)
@ -103,9 +100,6 @@ struct getppid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getppid(struct thread *td, struct getppid_args *uap)
@ -126,9 +120,6 @@ struct getpgrp_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
int
getpgrp(struct thread *td, struct getpgrp_args *uap)
{
@ -146,9 +137,6 @@ struct getpgid_args {
pid_t pid;
};
#endif
/*
* MPSAFE
*/
int
getpgid(struct thread *td, struct getpgid_args *uap)
{
@ -181,9 +169,6 @@ struct getsid_args {
pid_t pid;
};
#endif
/*
* MPSAFE
*/
int
getsid(struct thread *td, struct getsid_args *uap)
{
@ -213,9 +198,6 @@ struct getuid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getuid(struct thread *td, struct getuid_args *uap)
@ -233,9 +215,6 @@ struct geteuid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
geteuid(struct thread *td, struct geteuid_args *uap)
@ -250,9 +229,6 @@ struct getgid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getgid(struct thread *td, struct getgid_args *uap)
@ -275,9 +251,6 @@ struct getegid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getegid(struct thread *td, struct getegid_args *uap)
@ -293,9 +266,6 @@ struct getgroups_args {
gid_t *gidset;
};
#endif
/*
* MPSAFE
*/
int
getgroups(struct thread *td, register struct getgroups_args *uap)
{
@ -336,9 +306,6 @@ struct setsid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setsid(register struct thread *td, struct setsid_args *uap)
@ -397,9 +364,6 @@ struct setpgid_args {
int pgid; /* target pgrp id */
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setpgid(struct thread *td, register struct setpgid_args *uap)
@ -500,9 +464,6 @@ struct setuid_args {
uid_t uid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setuid(struct thread *td, struct setuid_args *uap)
@ -616,9 +577,6 @@ struct seteuid_args {
uid_t euid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
seteuid(struct thread *td, struct seteuid_args *uap)
@ -675,9 +633,6 @@ struct setgid_args {
gid_t gid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setgid(struct thread *td, struct setgid_args *uap)
@ -778,9 +733,6 @@ struct setegid_args {
gid_t egid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setegid(struct thread *td, struct setegid_args *uap)
@ -830,9 +782,6 @@ struct setgroups_args {
gid_t *gidset;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setgroups(struct thread *td, struct setgroups_args *uap)
@ -908,9 +857,6 @@ struct setreuid_args {
uid_t euid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setreuid(register struct thread *td, struct setreuid_args *uap)
@ -980,9 +926,6 @@ struct setregid_args {
gid_t egid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setregid(register struct thread *td, struct setregid_args *uap)
@ -1051,9 +994,6 @@ struct setresuid_args {
uid_t suid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setresuid(register struct thread *td, struct setresuid_args *uap)
@ -1136,9 +1076,6 @@ struct setresgid_args {
gid_t sgid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setresgid(register struct thread *td, struct setresgid_args *uap)
@ -1208,9 +1145,6 @@ struct getresuid_args {
uid_t *suid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getresuid(register struct thread *td, struct getresuid_args *uap)
@ -1238,9 +1172,6 @@ struct getresgid_args {
gid_t *sgid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getresgid(register struct thread *td, struct getresgid_args *uap)
@ -1266,9 +1197,6 @@ struct issetugid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
issetugid(register struct thread *td, struct issetugid_args *uap)
@ -1289,9 +1217,6 @@ issetugid(register struct thread *td, struct issetugid_args *uap)
return (0);
}
/*
* MPSAFE
*/
int
__setugid(struct thread *td, struct __setugid_args *uap)
{
@ -1321,8 +1246,6 @@ __setugid(struct thread *td, struct __setugid_args *uap)
/*
* Check if gid is a member of the group set.
*
* MPSAFE (cred must be held)
*/
int
groupmember(gid_t gid, struct ucred *cred)
@ -1345,8 +1268,6 @@ groupmember(gid_t gid, struct ucred *cred)
*
* XXXRW: Possibly since this has to do with privilege, it should move to
* kern_priv.c.
*
* MPSAFE
*/
int
securelevel_gt(struct ucred *cr, int level)
@ -1836,7 +1757,6 @@ p_canwait(struct thread *td, struct proc *p)
/*
* Allocate a zeroed cred structure.
* MPSAFE
*/
struct ucred *
crget(void)
@ -1853,7 +1773,6 @@ crget(void)
/*
* Claim another reference to a ucred structure.
* MPSAFE
*/
struct ucred *
crhold(struct ucred *cr)
@ -1864,9 +1783,7 @@ crhold(struct ucred *cr)
}
/*
* Free a cred structure.
* Throws away space when ref count gets to 0.
* MPSAFE
* Free a cred structure. Throws away space when ref count gets to 0.
*/
void
crfree(struct ucred *cr)
@ -1898,7 +1815,6 @@ crfree(struct ucred *cr)
/*
* Check to see if this ucred is shared.
* MPSAFE
*/
int
crshared(struct ucred *cr)
@ -1909,7 +1825,6 @@ crshared(struct ucred *cr)
/*
* Copy a ucred's contents from a template. Does not block.
* MPSAFE
*/
void
crcopy(struct ucred *dest, struct ucred *src)
@ -1930,7 +1845,6 @@ crcopy(struct ucred *dest, struct ucred *src)
/*
* Dup cred struct to a new held one.
* MPSAFE
*/
struct ucred *
crdup(struct ucred *cr)
@ -1944,7 +1858,6 @@ crdup(struct ucred *cr)
/*
* Fill in a struct xucred based on a struct ucred.
* MPSAFE
*/
void
cru2x(struct ucred *cr, struct xucred *xcr)
@ -1958,9 +1871,8 @@ cru2x(struct ucred *cr, struct xucred *xcr)
}
/*
* small routine to swap a thread's current ucred for the correct one
* taken from the process.
* MPSAFE
* small routine to swap a thread's current ucred for the correct one taken
* from the process.
*/
void
cred_update_thread(struct thread *td)
@ -1986,9 +1898,6 @@ struct getlogin_args {
u_int namelen;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getlogin(struct thread *td, struct getlogin_args *uap)
@ -2016,9 +1925,6 @@ struct setlogin_args {
char *namebuf;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setlogin(struct thread *td, struct setlogin_args *uap)

25
sys/kern/kern_resource.c
View File

@ -85,9 +85,6 @@ struct getpriority_args {
int who;
};
#endif
/*
* MPSAFE
*/
int
getpriority(td, uap)
struct thread *td;
@ -174,9 +171,6 @@ struct setpriority_args {
int prio;
};
#endif
/*
* MPSAFE
*/
int
setpriority(td, uap)
struct thread *td;
@ -278,8 +272,6 @@ donice(struct thread *td, struct proc *p, int n)
/*
* Set realtime priority for LWP.
*
* MPSAFE
*/
#ifndef _SYS_SYSPROTO_H_
struct rtprio_thread_args {
@ -373,8 +365,6 @@ rtprio_thread(struct thread *td, struct rtprio_thread_args *uap)
/*
* Set realtime priority.
*
* MPSAFE
*/
#ifndef _SYS_SYSPROTO_H_
struct rtprio_args {
@ -556,9 +546,6 @@ struct osetrlimit_args {
struct orlimit *rlp;
};
#endif
/*
* MPSAFE
*/
int
osetrlimit(td, uap)
struct thread *td;
@ -582,9 +569,6 @@ struct ogetrlimit_args {
struct orlimit *rlp;
};
#endif
/*
* MPSAFE
*/
int
ogetrlimit(td, uap)
struct thread *td;
@ -624,9 +608,6 @@ struct __setrlimit_args {
struct rlimit *rlp;
};
#endif
/*
* MPSAFE
*/
int
setrlimit(td, uap)
struct thread *td;
@ -771,9 +752,6 @@ struct __getrlimit_args {
struct rlimit *rlp;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getrlimit(td, uap)
@ -934,9 +912,6 @@ struct getrusage_args {
struct rusage *rusage;
};
#endif
/*
* MPSAFE
*/
int
getrusage(td, uap)
register struct thread *td;

6
sys/kern/kern_shutdown.c
View File

@ -150,9 +150,7 @@ shutdown_conf(void *unused)
SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL)
/*
* The system call that results in a reboot
*
* MPSAFE
* The system call that results in a reboot.
*/
/* ARGSUSED */
int
@ -495,8 +493,6 @@ static u_int panic_cpu = NOCPU;
* Panic is called on unresolvable fatal errors. It prints "panic: mesg",
* and then reboots. If we are called twice, then we avoid trying to sync
* the disks as this often leads to recursive panics.
*
* MPSAFE
*/
void
panic(const char *fmt, ...)

83
sys/kern/kern_sig.c
View File

@ -646,8 +646,6 @@ sig_ffs(sigset_t *set)
* sigaction
* freebsd4_sigaction
* osigaction
*
* MPSAFE
*/
int
kern_sigaction(td, sig, act, oact, flags)
@ -803,9 +801,6 @@ struct sigaction_args {
struct sigaction *oact;
};
#endif
/*
* MPSAFE
*/
int
sigaction(td, uap)
struct thread *td;
@ -836,9 +831,6 @@ struct freebsd4_sigaction_args {
struct sigaction *oact;
};
#endif
/*
* MPSAFE
*/
int
freebsd4_sigaction(td, uap)
struct thread *td;
@ -871,9 +863,6 @@ struct osigaction_args {
struct osigaction *osa;
};
#endif
/*
* MPSAFE
*/
int
osigaction(td, uap)
struct thread *td;
@ -1093,9 +1082,6 @@ osigprocmask(td, uap)
}
#endif /* COMPAT_43 */
/*
* MPSAFE
*/
int
sigwait(struct thread *td, struct sigwait_args *uap)
{
@ -1121,9 +1107,7 @@ sigwait(struct thread *td, struct sigwait_args *uap)
td->td_retval[0] = error;
return (0);
}
/*
* MPSAFE
*/
int
sigtimedwait(struct thread *td, struct sigtimedwait_args *uap)
{
@ -1158,9 +1142,6 @@ sigtimedwait(struct thread *td, struct sigtimedwait_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
sigwaitinfo(struct thread *td, struct sigwaitinfo_args *uap)
{
@ -1320,9 +1301,6 @@ struct sigpending_args {
sigset_t *set;
};
#endif
/*
* MPSAFE
*/
int
sigpending(td, uap)
struct thread *td;
@ -1344,9 +1322,6 @@ struct osigpending_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
int
osigpending(td, uap)
struct thread *td;
@ -1375,9 +1350,6 @@ struct osigvec_args {
struct sigvec *osv;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
osigvec(td, uap)
@ -1419,9 +1391,6 @@ struct osigblock_args {
int mask;
};
#endif
/*
* MPSAFE
*/
int
osigblock(td, uap)
register struct thread *td;
@ -1444,9 +1413,6 @@ struct osigsetmask_args {
int mask;
};
#endif
/*
* MPSAFE
*/
int
osigsetmask(td, uap)
struct thread *td;
@ -1475,9 +1441,6 @@ struct sigsuspend_args {
const sigset_t *sigmask;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
sigsuspend(td, uap)
@ -1528,9 +1491,6 @@ struct osigsuspend_args {
osigset_t mask;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
osigsuspend(td, uap)
@ -1562,9 +1522,6 @@ struct osigstack_args {
struct sigstack *oss;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
osigstack(td, uap)
@ -1600,9 +1557,6 @@ struct sigaltstack_args {
stack_t *oss;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
sigaltstack(td, uap)
@ -1732,9 +1686,6 @@ struct kill_args {
int signum;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
kill(td, uap)
@ -1780,9 +1731,6 @@ struct okillpg_args {
int signum;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
okillpg(td, uap)
@ -1885,11 +1833,9 @@ pgsignal(pgrp, sig, checkctty)
}
/*
* Send a signal caused by a trap to the current thread.
* If it will be caught immediately, deliver it with correct code.
* Otherwise, post it normally.
*
* MPSAFE
* Send a signal caused by a trap to the current thread. If it will be
* caught immediately, deliver it with correct code. Otherwise, post it
* normally.
*/
void
trapsignal(struct thread *td, ksiginfo_t *ksi)
@ -2041,8 +1987,6 @@ sigtd(struct proc *p, int sig, int prop)
* regardless of the signal action (eg, blocked or ignored).
*
* Other ignored signals are discarded immediately.
*
* MPSAFE
*/
void
psignal(struct proc *p, int sig)
@ -2073,9 +2017,6 @@ psignal_event(struct proc *p, struct sigevent *sigev, ksiginfo_t *ksi)
return (tdsignal(p, td, ksi->ksi_signo, ksi));
}
/*
* MPSAFE
*/
int
tdsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi)
{
@ -2731,9 +2672,6 @@ issignal(td)
/* NOTREACHED */
}
/*
* MPSAFE
*/
void
thread_stopped(struct proc *p)
{
@ -2892,8 +2830,6 @@ killproc(p, why)
* signal state. Mark the accounting record with the signal termination.
* If dumping core, save the signal number for the debugger. Calls exit and
* does not return.
*
* MPSAFE
*/
void
sigexit(td, sig)
@ -3208,17 +3144,14 @@ coredump(struct thread *td)
}
/*
* Nonexistent system call-- signal process (may want to handle it).
* Flag error in case process won't see signal immediately (blocked or ignored).
* Nonexistent system call-- signal process (may want to handle it). Flag
* error in case process won't see signal immediately (blocked or ignored).
*/
#ifndef _SYS_SYSPROTO_H_
struct nosys_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
nosys(td, args)
@ -3234,8 +3167,8 @@ nosys(td, args)
}
/*
* Send a SIGIO or SIGURG signal to a process or process group using
* stored credentials rather than those of the current process.
* Send a SIGIO or SIGURG signal to a process or process group using stored
* credentials rather than those of the current process.
*/
void
pgsigio(sigiop, sig, checkctty)

6
sys/kern/kern_sysctl.c
View File

@ -1295,9 +1295,6 @@ struct sysctl_args {
};
#endif
/*
* MPSAFE
*/
int
__sysctl(struct thread *td, struct sysctl_args *uap)
{
@ -1466,9 +1463,6 @@ struct getkerninfo_args {
};
#endif
/*
* MPSAFE
*/
int
ogetkerninfo(struct thread *td, struct getkerninfo_args *uap)
{

21
sys/kern/kern_time.c
View File

@ -187,9 +187,6 @@ struct clock_gettime_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
clock_gettime(struct thread *td, struct clock_gettime_args *uap)
@ -259,9 +256,6 @@ struct clock_settime_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
clock_settime(struct thread *td, struct clock_settime_args *uap)
@ -402,9 +396,6 @@ struct nanosleep_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
nanosleep(struct thread *td, struct nanosleep_args *uap)
@ -436,9 +427,6 @@ struct gettimeofday_args {
struct timezone *tzp;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
gettimeofday(struct thread *td, struct gettimeofday_args *uap)
@ -465,9 +453,6 @@ struct settimeofday_args {
struct timezone *tzp;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
settimeofday(struct thread *td, struct settimeofday_args *uap)
@ -546,9 +531,6 @@ struct getitimer_args {
struct itimerval *itv;
};
#endif
/*
* MPSAFE
*/
int
getitimer(struct thread *td, struct getitimer_args *uap)
{
@ -602,9 +584,6 @@ struct setitimer_args {
};
#endif
/*
* MPSAFE
*/
int
setitimer(struct thread *td, struct setitimer_args *uap)
{

24
sys/kern/kern_xxx.c
View File

@ -54,9 +54,6 @@ struct gethostname_args {
u_int len;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
ogethostname(td, uap)
@ -82,9 +79,6 @@ struct sethostname_args {
u_int len;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
osethostname(td, uap)
@ -108,9 +102,6 @@ struct ogethostid_args {
int dummy;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
ogethostid(td, uap)
@ -129,9 +120,6 @@ struct osethostid_args {
long hostid;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
osethostid(td, uap)
@ -149,9 +137,6 @@ osethostid(td, uap)
return (0);
}
/*
* MPSAFE
*/
int
oquota(td, uap)
struct thread *td;
@ -175,9 +160,6 @@ struct uname_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
uname(td, uap)
@ -258,9 +240,6 @@ struct getdomainname_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
getdomainname(td, uap)
@ -286,9 +265,6 @@ struct setdomainname_args {
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
setdomainname(td, uap)

24
sys/kern/p1003_1b.c
View File

@ -107,9 +107,6 @@ sched_attach(void)
return ret;
}
/*
* MPSAFE
*/
int
sched_setparam(struct thread *td, struct sched_setparam_args *uap)
{
@ -142,9 +139,6 @@ sched_setparam(struct thread *td, struct sched_setparam_args *uap)
return (e);
}
/*
* MPSAFE
*/
int
sched_getparam(struct thread *td, struct sched_getparam_args *uap)
{
@ -175,9 +169,6 @@ sched_getparam(struct thread *td, struct sched_getparam_args *uap)
return (e);
}
/*
* MPSAFE
*/
int
sched_setscheduler(struct thread *td, struct sched_setscheduler_args *uap)
{
@ -215,9 +206,6 @@ sched_setscheduler(struct thread *td, struct sched_setscheduler_args *uap)
return (e);
}
/*
* MPSAFE
*/
int
sched_getscheduler(struct thread *td, struct sched_getscheduler_args *uap)
{
@ -249,9 +237,6 @@ sched_getscheduler(struct thread *td, struct sched_getscheduler_args *uap)
return (e);
}
/*
* MPSAFE
*/
int
sched_yield(struct thread *td, struct sched_yield_args *uap)
{
@ -259,9 +244,6 @@ sched_yield(struct thread *td, struct sched_yield_args *uap)
return (ksched_yield(ksched));
}
/*
* MPSAFE
*/
int
sched_get_priority_max(struct thread *td,
struct sched_get_priority_max_args *uap)
@ -273,9 +255,6 @@ sched_get_priority_max(struct thread *td,
return (error);
}
/*
* MPSAFE
*/
int
sched_get_priority_min(struct thread *td,
struct sched_get_priority_min_args *uap)
@ -287,9 +266,6 @@ sched_get_priority_min(struct thread *td,
return (error);
}
/*
* MPSAFE
*/
int
sched_rr_get_interval(struct thread *td,
struct sched_rr_get_interval_args *uap)

3
sys/kern/subr_prof.c
View File

@ -402,9 +402,6 @@ struct profil_args {
u_int scale;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
profil(td, uap)

6
sys/kern/subr_trap.c
View File

@ -69,10 +69,8 @@ __FBSDID("$FreeBSD$");
#include <security/mac/mac_framework.h>
/*
* Define the code needed before returning to user mode, for
* trap and syscall.
*
* MPSAFE
* Define the code needed before returning to user mode, for trap and
* syscall.
*/
void
userret(struct thread *td, struct trapframe *frame)

55
sys/kern/sys_generic.c
View File

@ -93,9 +93,6 @@ struct read_args {
size_t nbyte;
};
#endif
/*
* MPSAFE
*/
int
read(td, uap)
struct thread *td;
@ -129,9 +126,6 @@ struct pread_args {
off_t offset;
};
#endif
/*
* MPSAFE
*/
int
pread(td, uap)
struct thread *td;
@ -163,9 +157,6 @@ struct readv_args {
u_int iovcnt;
};
#endif
/*
* MPSAFE
*/
int
readv(struct thread *td, struct readv_args *uap)
{
@ -205,9 +196,6 @@ struct preadv_args {
off_t offset;
};
#endif
/*
* MPSAFE
*/
int
preadv(struct thread *td, struct preadv_args *uap)
{
@ -303,9 +291,6 @@ struct write_args {
size_t nbyte;
};
#endif
/*
* MPSAFE
*/
int
write(td, uap)
struct thread *td;
@ -328,7 +313,7 @@ write(td, uap)
}
/*
* Positioned write system call
* Positioned write system call.
*/
#ifndef _SYS_SYSPROTO_H_
struct pwrite_args {
@ -339,9 +324,6 @@ struct pwrite_args {
off_t offset;
};
#endif
/*
* MPSAFE
*/
int
pwrite(td, uap)
struct thread *td;
@ -364,7 +346,7 @@ pwrite(td, uap)
}
/*
* Gather write system call
* Gather write system call.
*/
#ifndef _SYS_SYSPROTO_H_
struct writev_args {
@ -373,9 +355,6 @@ struct writev_args {
u_int iovcnt;
};
#endif
/*
* MPSAFE
*/
int
writev(struct thread *td, struct writev_args *uap)
{
@ -405,7 +384,7 @@ kern_writev(struct thread *td, int fd, struct uio *auio)
}
/*
* Gather positioned write system call
* Gather positioned write system call.
*/
#ifndef _SYS_SYSPROTO_H_
struct pwritev_args {
@ -415,9 +394,6 @@ struct pwritev_args {
off_t offset;
};
#endif
/*
* MPSAFE
*/
int
pwritev(struct thread *td, struct pwritev_args *uap)
{
@ -507,7 +483,7 @@ dofilewrite(td, fd, fp, auio, offset, flags)
}
/*
* Ioctl system call
* Ioctl system call.
*/
#ifndef _SYS_SYSPROTO_H_
struct ioctl_args {
@ -516,9 +492,6 @@ struct ioctl_args {
caddr_t data;
};
#endif
/*
* MPSAFE
*/
/* ARGSUSED */
int
ioctl(struct thread *td, struct ioctl_args *uap)
@ -657,9 +630,6 @@ struct select_args {
struct timeval *tv;
};
#endif
/*
* MPSAFE
*/
int
select(td, uap)
register struct thread *td;
@ -889,9 +859,6 @@ struct poll_args {
int timeout;
};
#endif
/*
* MPSAFE
*/
int
poll(td, uap)
struct thread *td;
@ -1052,6 +1019,7 @@ pollscan(td, fds, nfd)
/*
* OpenBSD poll system call.
*
* XXX this isn't quite a true representation.. OpenBSD uses select ops.
*/
#ifndef _SYS_SYSPROTO_H_
@ -1061,9 +1029,6 @@ struct openbsd_poll_args {
int timeout;
};
#endif
/*
* MPSAFE
*/
int
openbsd_poll(td, uap)
register struct thread *td;
@ -1073,12 +1038,12 @@ openbsd_poll(td, uap)
}
/*
* Remove the references to the thread from all of the objects
* we were polling.
* Remove the references to the thread from all of the objects we were
* polling.
*
* This code assumes that the underlying owner of the selinfo
* structure will hold sellock before it changes it, and that
* it will unlink itself from our list if it goes away.
* This code assumes that the underlying owner of the selinfo structure will
* hold sellock before it changes it, and that it will unlink itself from our
* list if it goes away.
*/
void
clear_selinfo_list(td)

3
sys/kern/sys_process.c
View File

@ -368,9 +368,6 @@ struct ptrace_args {
#define COPYIN(u, k, s) copyin(u, k, s)
#define COPYOUT(k, u, s) copyout(k, u, s)
#endif
/*
* MPSAFE
*/
int
ptrace(struct thread *td, struct ptrace_args *uap)
{

16
sys/kern/sysv_msg.c
View File

@ -320,9 +320,7 @@ DECLARE_MODULE(sysvmsg, sysvmsg_mod,
MODULE_VERSION(sysvmsg, 1);
/*
* Entry point for all MSG calls
*
* MPSAFE
* Entry point for all MSG calls.
*/
int
msgsys(td, uap)
@ -383,9 +381,6 @@ struct msgctl_args {
};
#endif
/*
* MPSAFE
*/
int
msgctl(td, uap)
struct thread *td;
@ -559,9 +554,6 @@ struct msgget_args {
};
#endif
/*
* MPSAFE
*/
int
msgget(td, uap)
struct thread *td;
@ -979,9 +971,6 @@ kern_msgsnd(td, msqid, msgp, msgsz, msgflg, mtype)
return (error);
}
/*
* MPSAFE
*/
int
msgsnd(td, uap)
struct thread *td;
@ -1265,9 +1254,6 @@ kern_msgrcv(td, msqid, msgp, msgsz, msgtyp, msgflg, mtype)
return (error);
}
/*
* MPSAFE
*/
int
msgrcv(td, uap)
struct thread *td;

15
sys/kern/sysv_sem.c
View File

@ -319,9 +319,7 @@ DECLARE_MODULE(sysvsem, sysvsem_mod,
MODULE_VERSION(sysvsem, 1);
/*
* Entry point for all SEM calls
*
* MPSAFE
* Entry point for all SEM calls.
*/
int
semsys(td, uap)
@ -533,7 +531,7 @@ semvalid(semid, semakptr)
}
/*
* Note that the user-mode half of this passes a union, not a pointer
* Note that the user-mode half of this passes a union, not a pointer.
*/
#ifndef _SYS_SYSPROTO_H_
struct __semctl_args {
@ -544,9 +542,6 @@ struct __semctl_args {
};
#endif
/*
* MPSAFE
*/
int
__semctl(td, uap)
struct thread *td;
@ -874,9 +869,6 @@ struct semget_args {
};
#endif
/*
* MPSAFE
*/
int
semget(td, uap)
struct thread *td;
@ -990,9 +982,6 @@ struct semop_args {
};
#endif
/*
* MPSAFE
*/
int
semop(td, uap)
struct thread *td;

18
sys/kern/sysv_shm.c
View File

@ -290,9 +290,6 @@ struct shmdt_args {
};
#endif
/*
* MPSAFE
*/
int
shmdt(td, uap)
struct thread *td;
@ -344,9 +341,6 @@ struct shmat_args {
};
#endif
/*
* MPSAFE
*/
int
kern_shmat(td, shmid, shmaddr, shmflg)
struct thread *td;
@ -477,9 +471,6 @@ struct oshmctl_args {
struct oshmid_ds *ubuf;
};
/*
* MPSAFE
*/
static int
oshmctl(td, uap)
struct thread *td;
@ -542,9 +533,6 @@ struct shmctl_args {
};
#endif
/*
* MPSAFE
*/
int
kern_shmctl(td, shmid, cmd, buf, bufsz)
struct thread *td;
@ -813,9 +801,6 @@ shmget_allocate_segment(td, uap, mode)
return (0);
}
/*
* MPSAFE
*/
int
shmget(td, uap)
struct thread *td;
@ -848,9 +833,6 @@ shmget(td, uap)
return (error);
}
/*
* MPSAFE
*/
int
shmsys(td, uap)
struct thread *td;

81
sys/kern/uipc_syscalls.c
View File

@ -150,9 +150,6 @@ getsock(struct filedesc *fdp, int fd, struct file **fpp, u_int *fflagp)
#define COMPAT_OLDSOCK
#endif
/*
* MPSAFE
*/
int
socket(td, uap)
struct thread *td;
@ -197,9 +194,6 @@ socket(td, uap)
return (error);
}
/*
* MPSAFE
*/
/* ARGSUSED */
int
bind(td, uap)
@ -253,9 +247,6 @@ kern_bind(td, fd, sa)
return (error);
}
/*
* MPSAFE
*/
/* ARGSUSED */
int
listen(td, uap)
@ -292,7 +283,6 @@ listen(td, uap)
/*
* accept1()
* MPSAFE
*/
static int
accept1(td, uap, compat)
@ -506,9 +496,6 @@ kern_accept(struct thread *td, int s, struct sockaddr **name,
return (error);
}
/*
* MPSAFE (accept1() is MPSAFE)
*/
int
accept(td, uap)
struct thread *td;
@ -519,9 +506,6 @@ accept(td, uap)
}
#ifdef COMPAT_OLDSOCK
/*
* MPSAFE (accept1() is MPSAFE)
*/
int
oaccept(td, uap)
struct thread *td;
@ -532,9 +516,6 @@ oaccept(td, uap)
}
#endif /* COMPAT_OLDSOCK */
/*
* MPSAFE
*/
/* ARGSUSED */
int
connect(td, uap)
@ -619,9 +600,6 @@ kern_connect(td, fd, sa)
return (error);
}
/*
* MPSAFE
*/
int
socketpair(td, uap)
struct thread *td;
@ -848,9 +826,6 @@ kern_sendit(td, s, mp, flags, control, segflg)
return (error);
}
/*
* MPSAFE
*/
int
sendto(td, uap)
struct thread *td;
@ -882,9 +857,6 @@ sendto(td, uap)
}
#ifdef COMPAT_OLDSOCK
/*
* MPSAFE
*/
int
osend(td, uap)
struct thread *td;
@ -911,9 +883,6 @@ osend(td, uap)
return (error);
}
/*
* MPSAFE
*/
int
osendmsg(td, uap)
struct thread *td;
@ -941,9 +910,6 @@ osendmsg(td, uap)
}
#endif
/*
* MPSAFE
*/
int
sendmsg(td, uap)
struct thread *td;
@ -1157,9 +1123,6 @@ recvit(td, s, mp, namelenp)
return (error);
}
/*
* MPSAFE
*/
int
recvfrom(td, uap)
struct thread *td;
@ -1197,9 +1160,6 @@ recvfrom(td, uap)
}
#ifdef COMPAT_OLDSOCK
/*
* MPSAFE
*/
int
orecvfrom(td, uap)
struct thread *td;
@ -1213,9 +1173,6 @@ orecvfrom(td, uap)
#ifdef COMPAT_OLDSOCK
/*
* MPSAFE
*/
int
orecv(td, uap)
struct thread *td;
@ -1246,8 +1203,6 @@ orecv(td, uap)
* Old recvmsg. This code takes advantage of the fact that the old msghdr
* overlays the new one, missing only the flags, and with the (old) access
* rights where the control fields are now.
*
* MPSAFE
*/
int
orecvmsg(td, uap)
@ -1279,9 +1234,6 @@ orecvmsg(td, uap)
}
#endif
/*
* MPSAFE
*/
int
recvmsg(td, uap)
struct thread *td;
@ -1316,9 +1268,6 @@ recvmsg(td, uap)
return (error);
}
/*
* MPSAFE
*/
/* ARGSUSED */
int
shutdown(td, uap)
@ -1343,9 +1292,6 @@ shutdown(td, uap)
return (error);
}
/*
* MPSAFE
*/
/* ARGSUSED */
int
setsockopt(td, uap)
@ -1410,9 +1356,6 @@ kern_setsockopt(td, s, level, name, val, valseg, valsize)
return(error);
}
/*
* MPSAFE
*/
/* ARGSUSED */
int
getsockopt(td, uap)
@ -1496,8 +1439,6 @@ kern_getsockopt(td, s, level, name, val, valseg, valsize)
/*
* getsockname1() - Get socket name.
*
* MPSAFE
*/
/* ARGSUSED */
static int
@ -1572,9 +1513,6 @@ kern_getsockname(struct thread *td, int fd, struct sockaddr **sa,
return (error);
}
/*
* MPSAFE
*/
int
getsockname(td, uap)
struct thread *td;
@ -1585,9 +1523,6 @@ getsockname(td, uap)
}
#ifdef COMPAT_OLDSOCK
/*
* MPSAFE
*/
int
ogetsockname(td, uap)
struct thread *td;
@ -1600,8 +1535,6 @@ ogetsockname(td, uap)
/*
* getpeername1() - Get name of peer for connected socket.
*
* MPSAFE
*/
/* ARGSUSED */
static int
@ -1681,9 +1614,6 @@ kern_getpeername(struct thread *td, int fd, struct sockaddr **sa,
return (error);
}
/*
* MPSAFE
*/
int
getpeername(td, uap)
struct thread *td;
@ -1694,9 +1624,6 @@ getpeername(td, uap)
}
#ifdef COMPAT_OLDSOCK
/*
* MPSAFE
*/
int
ogetpeername(td, uap)
struct thread *td;
@ -1809,15 +1736,13 @@ sf_buf_mext(void *addr, void *args)
/*
* sendfile(2)
*
* MPSAFE
*
* int sendfile(int fd, int s, off_t offset, size_t nbytes,
* struct sf_hdtr *hdtr, off_t *sbytes, int flags)
*
* Send a file specified by 'fd' and starting at 'offset' to a socket
* specified by 's'. Send only 'nbytes' of the file or until EOF if
* nbytes == 0. Optionally add a header and/or trailer to the socket
* output. If specified, write the total number of bytes sent into *sbytes.
* specified by 's'. Send only 'nbytes' of the file or until EOF if nbytes ==
* 0. Optionally add a header and/or trailer to the socket output. If
* specified, write the total number of bytes sent into *sbytes.
*
*/
int

30
sys/kern/vfs_acl.c
View File

@ -185,8 +185,6 @@ vacl_aclcheck(struct thread *td, struct vnode *vp, acl_type_t type,
/*
* Given a file path, get an ACL for it
*
* MPSAFE
*/
int
__acl_get_file(struct thread *td, struct __acl_get_file_args *uap)
@ -207,8 +205,6 @@ __acl_get_file(struct thread *td, struct __acl_get_file_args *uap)
/*
* Given a file path, get an ACL for it; don't follow links.
*
* MPSAFE
*/
int
__acl_get_link(struct thread *td, struct __acl_get_link_args *uap)
@ -228,9 +224,7 @@ __acl_get_link(struct thread *td, struct __acl_get_link_args *uap)
}
/*
* Given a file path, set an ACL for it
*
* MPSAFE
* Given a file path, set an ACL for it.
*/
int
__acl_set_file(struct thread *td, struct __acl_set_file_args *uap)
@ -251,8 +245,6 @@ __acl_set_file(struct thread *td, struct __acl_set_file_args *uap)
/*
* Given a file path, set an ACL for it; don't follow links.
*
* MPSAFE
*/
int
__acl_set_link(struct thread *td, struct __acl_set_link_args *uap)
@ -273,8 +265,6 @@ __acl_set_link(struct thread *td, struct __acl_set_link_args *uap)
/*
* Given a file descriptor, get an ACL for it
*
* MPSAFE
*/
int
__acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap)
@ -294,8 +284,6 @@ __acl_get_fd(struct thread *td, struct __acl_get_fd_args *uap)
/*
* Given a file descriptor, set an ACL for it
*
* MPSAFE
*/
int
__acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap)
@ -315,8 +303,6 @@ __acl_set_fd(struct thread *td, struct __acl_set_fd_args *uap)
/*
* Given a file path, delete an ACL from it.
*
* MPSAFE
*/
int
__acl_delete_file(struct thread *td, struct __acl_delete_file_args *uap)
@ -337,8 +323,6 @@ __acl_delete_file(struct thread *td, struct __acl_delete_file_args *uap)
/*
* Given a file path, delete an ACL from it; don't follow links.
*
* MPSAFE
*/
int
__acl_delete_link(struct thread *td, struct __acl_delete_link_args *uap)
@ -359,8 +343,6 @@ __acl_delete_link(struct thread *td, struct __acl_delete_link_args *uap)
/*
* Given a file path, delete an ACL from it.
*
* MPSAFE
*/
int
__acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap)
@ -379,9 +361,7 @@ __acl_delete_fd(struct thread *td, struct __acl_delete_fd_args *uap)
}
/*
* Given a file path, check an ACL for it
*
* MPSAFE
* Given a file path, check an ACL for it.
*/
int
__acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap)
@ -402,8 +382,6 @@ __acl_aclcheck_file(struct thread *td, struct __acl_aclcheck_file_args *uap)
/*
* Given a file path, check an ACL for it; don't follow links.
*
* MPSAFE
*/
int
__acl_aclcheck_link(struct thread *td, struct __acl_aclcheck_link_args *uap)
@ -423,9 +401,7 @@ __acl_aclcheck_link(struct thread *td, struct __acl_aclcheck_link_args *uap)
}
/*
* Given a file descriptor, check an ACL for it
*
* MPSAFE
* Given a file descriptor, check an ACL for it.
*/
int
__acl_aclcheck_fd(struct thread *td, struct __acl_aclcheck_fd_args *uap)

3
sys/nfsserver/nfs_syscalls.c
View File

@ -125,9 +125,6 @@ struct nfssvc_args {
caddr_t argp;
};
#endif
/*
* MPSAFE
*/
int
nfssvc(struct thread *td, struct nfssvc_args *uap)
{

5
sys/security/audit/audit.c
View File

@ -290,8 +290,6 @@ currecord(void)
}
/*
* MPSAFE
*
* XXXAUDIT: There are a number of races present in the code below due to
* release and re-grab of the mutex. The code should be revised to become
* slightly less racy.
@ -333,9 +331,6 @@ audit_free(struct kaudit_record *ar)
uma_zfree(audit_record_zone, ar);
}
/*
* MPSAFE
*/
void
audit_commit(struct kaudit_record *ar, int error, int retval)
{

12
sys/security/audit/audit_syscalls.c
View File

@ -47,8 +47,6 @@
#ifdef AUDIT
/*
* MPSAFE
*
* System call to allow a user space application to submit a BSM audit record
* to the kernel for inclusion in the audit log. This function does little
* verification on the audit record that is submitted.
@ -142,8 +140,6 @@ audit(struct thread *td, struct audit_args *uap)
}
/*
* MPSAFE
*
* System call to manipulate auditing.
*/
/* ARGSUSED */
@ -395,8 +391,6 @@ auditon(struct thread *td, struct auditon_args *uap)
}
/*
* MPSAFE
*
* System calls to manage the user audit information.
*/
/* ARGSUSED */
@ -422,7 +416,6 @@ getauid(struct thread *td, struct getauid_args *uap)
return copyout(&id, uap->auid, sizeof(id));
}
/* MPSAFE */
/* ARGSUSED */
int
setauid(struct thread *td, struct setauid_args *uap)
@ -460,7 +453,6 @@ setauid(struct thread *td, struct setauid_args *uap)
}
/*
* MPSAFE
* System calls to get and set process audit information.
*/
/* ARGSUSED */
@ -483,7 +475,6 @@ getaudit(struct thread *td, struct getaudit_args *uap)
return (copyout(&ai, uap->auditinfo, sizeof(ai)));
}
/* MPSAFE */
/* ARGSUSED */
int
setaudit(struct thread *td, struct setaudit_args *uap)
@ -513,7 +504,6 @@ setaudit(struct thread *td, struct setaudit_args *uap)
return (0);
}
/* MPSAFE */
/* ARGSUSED */
int
getaudit_addr(struct thread *td, struct getaudit_addr_args *uap)
@ -528,7 +518,6 @@ getaudit_addr(struct thread *td, struct getaudit_addr_args *uap)
return (ENOSYS);
}
/* MPSAFE */
/* ARGSUSED */
int
setaudit_addr(struct thread *td, struct setaudit_addr_args *uap)
@ -544,7 +533,6 @@ setaudit_addr(struct thread *td, struct setaudit_addr_args *uap)
}
/*
* MPSAFE
* Syscall to manage audit files.
*/
/* ARGSUSED */

30
sys/security/mac/mac_syscalls.c
View File

@ -67,9 +67,6 @@ __FBSDID("$FreeBSD$");
#ifdef MAC
/*
* MPSAFE
*/
int
__mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
{
@ -119,9 +116,6 @@ __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
{
@ -155,9 +149,6 @@ __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
{
@ -224,9 +215,6 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
{
@ -313,9 +301,6 @@ __mac_get_fd(struct thread *td, struct __mac_get_fd_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
{
@ -366,9 +351,6 @@ __mac_get_file(struct thread *td, struct __mac_get_file_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
{
@ -419,9 +401,6 @@ __mac_get_link(struct thread *td, struct __mac_get_link_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
{
@ -514,9 +493,6 @@ __mac_set_fd(struct thread *td, struct __mac_set_fd_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
{
@ -568,9 +544,6 @@ __mac_set_file(struct thread *td, struct __mac_set_file_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
__mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
{
@ -622,9 +595,6 @@ __mac_set_link(struct thread *td, struct __mac_set_link_args *uap)
return (error);
}
/*
* MPSAFE
*/
int
mac_syscall(struct thread *td, struct mac_syscall_args *uap)
{