- Change all VFS syscalls to MSTD as they all manually deal with giant

   or the appropriate filesystem locks.

Sponsored By:	Isilon Systems, Inc.

1 files changed, 46 insertions, 46 deletions

diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 790a3bf..648d654 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -61,11 +61,11 @@
 9	MSTD	{ int link(char *path, char *link); }
 10	MSTD	{ int unlink(char *path); }
 11	OBSOL	execv
-12	STD	{ int chdir(char *path); }
-13	STD	{ int fchdir(int fd); }
-14	STD	{ int mknod(char *path, int mode, int dev); }
-15	STD	{ int chmod(char *path, int mode); }
-16	STD	{ int chown(char *path, int uid, int gid); }
+12	MSTD	{ int chdir(char *path); }
+13	MSTD	{ int fchdir(int fd); }
+14	MSTD	{ int mknod(char *path, int mode, int dev); }
+15	MSTD	{ int chmod(char *path, int mode); }
+16	MSTD	{ int chown(char *path, int uid, int gid); }
 17	MSTD	{ int obreak(char *nsize); } break obreak_args int
 18	COMPAT4	{ int getfsstat(struct ostatfs *buf, long bufsize, int flags); }
 19	COMPAT	{ long lseek(int fd, long offset, int whence); }
@@ -88,10 +88,10 @@
 		    __socklen_t * __restrict alen); }
 32	MSTD	{ int getsockname(int fdes, struct sockaddr * __restrict asa, \
 		    __socklen_t * __restrict alen); }
-33	STD	{ int access(char *path, int flags); }
-34	STD	{ int chflags(char *path, int flags); }
-35	STD	{ int fchflags(int fd, int flags); }
-36	STD	{ int sync(void); }
+33	MSTD	{ int access(char *path, int flags); }
+34	MSTD	{ int chflags(char *path, int flags); }
+35	MSTD	{ int fchflags(int fd, int flags); }
+36	MSTD	{ int sync(void); }
 37	MSTD	{ int kill(int pid, int signum); }
 38	COMPAT	{ int stat(char *path, struct ostat *ub); }
 39	MSTD	{ pid_t getppid(void); }
@@ -116,12 +116,12 @@
 53	MSTD	{ int sigaltstack(stack_t *ss, stack_t *oss); }
 54	MSTD	{ int ioctl(int fd, u_long com, caddr_t data); }
 55	MSTD	{ int reboot(int opt); }
-56	STD	{ int revoke(char *path); }
-57	STD	{ int symlink(char *path, char *link); }
-58	STD	{ int readlink(char *path, char *buf, int count); }
+56	MSTD	{ int revoke(char *path); }
+57	MSTD	{ int symlink(char *path, char *link); }
+58	MSTD	{ int readlink(char *path, char *buf, int count); }
 59	MSTD	{ int execve(char *fname, char **argv, char **envv); }
 60	MSTD	{ int umask(int newmask); } umask umask_args int
-61	STD	{ int chroot(char *path); }
+61	MSTD	{ int chroot(char *path); }
 62	MCOMPAT	{ int fstat(int fd, struct ostat *sb); }
 63	MCOMPAT	{ int getkerninfo(int op, char *where, size_t *size, \
 		    int arg); } getkerninfo getkerninfo_args int
@@ -163,7 +163,7 @@
 93	MSTD	{ int select(int nd, fd_set *in, fd_set *ou, \
 		    fd_set *ex, struct timeval *tv); }
 94	UNIMPL	setdopt
-95	STD	{ int fsync(int fd); }
+95	MSTD	{ int fsync(int fd); }
 96	MSTD	{ int setpriority(int which, int who, int prio); }
 97	MSTD	{ int socket(int domain, int type, int protocol); }
 98	MSTD	{ int connect(int s, caddr_t name, int namelen); }
@@ -197,26 +197,26 @@
 120	MSTD	{ int readv(int fd, struct iovec *iovp, u_int iovcnt); }
 121	MSTD	{ int writev(int fd, struct iovec *iovp, u_int iovcnt); }
 122	MSTD	{ int settimeofday(struct timeval *tv, struct timezone *tzp); }
-123	STD	{ int fchown(int fd, int uid, int gid); }
-124	STD	{ int fchmod(int fd, int mode); }
+123	MSTD	{ int fchown(int fd, int uid, int gid); }
+124	MSTD	{ int fchmod(int fd, int mode); }
 125	MCPT_NOA { int recvfrom(int s, caddr_t buf, size_t len, int flags, \
 		    caddr_t from, int *fromlenaddr); } \
 		    recvfrom recvfrom_args int
 126	MSTD	{ int setreuid(int ruid, int euid); }
 127	MSTD	{ int setregid(int rgid, int egid); }
-128	STD	{ int rename(char *from, char *to); }
+128	MSTD	{ int rename(char *from, char *to); }
 129	COMPAT	{ int truncate(char *path, long length); }
 130	COMPAT	{ int ftruncate(int fd, long length); }
 131	MSTD	{ int flock(int fd, int how); }
-132	STD	{ int mkfifo(char *path, int mode); }
+132	MSTD	{ int mkfifo(char *path, int mode); }
 133	MSTD	{ int sendto(int s, caddr_t buf, size_t len, int flags, \
 		    caddr_t to, int tolen); }
 134	MSTD	{ int shutdown(int s, int how); }
 135	MSTD	{ int socketpair(int domain, int type, int protocol, \
 		    int *rsv); }
-136	STD	{ int mkdir(char *path, int mode); }
-137	STD	{ int rmdir(char *path); }
-138	STD	{ int utimes(char *path, struct timeval *tptr); }
+136	MSTD	{ int mkdir(char *path, int mode); }
+137	MSTD	{ int rmdir(char *path); }
+138	MSTD	{ int utimes(char *path, struct timeval *tptr); }
 139	OBSOL	4.2 sigreturn
 140	MSTD	{ int adjtime(struct timeval *delta, \
 		    struct timeval *olddelta); }
@@ -247,8 +247,8 @@
 157	COMPAT4	{ int statfs(char *path, struct ostatfs *buf); }
 158	COMPAT4	{ int fstatfs(int fd, struct ostatfs *buf); }
 159	UNIMPL	nosys
-160	STD	{ int lgetfh(char *fname, struct fhandle *fhp); }
-161	STD	{ int getfh(char *fname, struct fhandle *fhp); }
+160	MSTD	{ int lgetfh(char *fname, struct fhandle *fhp); }
+161	MSTD	{ int getfh(char *fname, struct fhandle *fhp); }
 162	MSTD	{ int getdomainname(char *domainname, int len); }
 163	MSTD	{ int setdomainname(char *domainname, int len); }
 164	MSTD	{ int uname(struct utsname *name); }
@@ -286,31 +286,31 @@
 185	UNIMPL	lfs_markv
 186	UNIMPL	lfs_segclean
 187	UNIMPL	lfs_segwait
-188	STD	{ int stat(char *path, struct stat *ub); }
+188	MSTD	{ int stat(char *path, struct stat *ub); }
 189	MSTD	{ int fstat(int fd, struct stat *sb); }
-190	STD	{ int lstat(char *path, struct stat *ub); }
-191	STD	{ int pathconf(char *path, int name); }
+190	MSTD	{ int lstat(char *path, struct stat *ub); }
+191	MSTD	{ int pathconf(char *path, int name); }
 192	MSTD	{ int fpathconf(int fd, int name); }
 193	UNIMPL	nosys
 194	MSTD	{ int getrlimit(u_int which, struct rlimit *rlp); } \
 		    getrlimit __getrlimit_args int
 195	MSTD	{ int setrlimit(u_int which, struct rlimit *rlp); } \
 		    setrlimit __setrlimit_args int
-196	STD	{ int getdirentries(int fd, char *buf, u_int count, \
+196	MSTD	{ int getdirentries(int fd, char *buf, u_int count, \
 		    long *basep); }
 197	MSTD	{ caddr_t mmap(caddr_t addr, size_t len, int prot, \
 		    int flags, int fd, int pad, off_t pos); }
-198	STD	{ int nosys(void); } __syscall __syscall_args int
-199	STD	{ off_t lseek(int fd, int pad, off_t offset, int whence); }
-200	STD	{ int truncate(char *path, int pad, off_t length); }
-201	STD	{ int ftruncate(int fd, int pad, off_t length); }
+198	MSTD	{ int nosys(void); } __syscall __syscall_args int
+199	MSTD	{ off_t lseek(int fd, int pad, off_t offset, int whence); }
+200	MSTD	{ int truncate(char *path, int pad, off_t length); }
+201	MSTD	{ int ftruncate(int fd, int pad, off_t length); }
 202	MSTD	{ int __sysctl(int *name, u_int namelen, void *old, \
 		    size_t *oldlenp, void *new, size_t newlen); } \
 		    __sysctl sysctl_args int
 203	MSTD	{ int mlock(const void *addr, size_t len); }
 204	MSTD	{ int munlock(const void *addr, size_t len); }
-205	STD	{ int undelete(char *path); }
-206	STD	{ int futimes(int fd, struct timeval *tptr); }
+205	MSTD	{ int undelete(char *path); }
+206	MSTD	{ int futimes(int fd, struct timeval *tptr); }
 207	MSTD	{ int getpgid(pid_t pid); }
 208	UNIMPL	newreboot (NetBSD)
 209	MSTD	{ int poll(struct pollfd *fds, u_int nfds, int timeout); }
@@ -374,7 +374,7 @@
 252	MSTD	{ int openbsd_poll(struct pollfd *fds, u_int nfds, \
 		    int timeout); }
 253	MSTD	{ int issetugid(void); }
-254	STD	{ int lchown(char *path, int uid, int gid); }
+254	MSTD	{ int lchown(char *path, int uid, int gid); }
 255	UNIMPL	nosys
 256	UNIMPL	nosys
 257	UNIMPL	nosys
@@ -392,17 +392,17 @@
 269	UNIMPL	nosys
 270	UNIMPL	nosys
 271	UNIMPL	nosys
-272	STD	{ int getdents(int fd, char *buf, size_t count); }
+272	MSTD	{ int getdents(int fd, char *buf, size_t count); }
 273	UNIMPL	nosys
-274	STD	{ int lchmod(char *path, mode_t mode); }
+274	MSTD	{ int lchmod(char *path, mode_t mode); }
 275	NOPROTO { int lchown(char *path, uid_t uid, gid_t gid); } \
 		    netbsd_lchown lchown_args int
-276	STD	{ int lutimes(char *path, struct timeval *tptr); }
+276	MSTD	{ int lutimes(char *path, struct timeval *tptr); }
 277	MNOPROTO { int msync(void *addr, size_t len, int flags); } \
 		    netbsd_msync msync_args int
-278	STD	{ int nstat(char *path, struct nstat *ub); }
+278	MSTD	{ int nstat(char *path, struct nstat *ub); }
 279	MSTD	{ int nfstat(int fd, struct nstat *sb); }
-280	STD	{ int nlstat(char *path, struct nstat *ub); }
+280	MSTD	{ int nlstat(char *path, struct nstat *ub); }
 281	UNIMPL	nosys
 282	UNIMPL	nosys
 283	UNIMPL	nosys
@@ -453,7 +453,7 @@
 323	OBSOL	thr_wakeup
 324     MSTD	{ int mlockall(int how); }
 325     MSTD	{ int munlockall(void); }
-326     STD	{ int __getcwd(u_char *buf, u_int buflen); }
+326     MSTD	{ int __getcwd(u_char *buf, u_int buflen); }
 
 327     MSTD	{ int sched_setparam (pid_t pid, \
 		    const struct sched_param *param); }
@@ -471,7 +471,7 @@
 335	MSTD	{ int utrace(const void *addr, size_t len); }
 336	MCOMPAT4 { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
 		    struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
-337	STD	{ int kldsym(int fileid, int cmd, void *data); }
+337	MSTD	{ int kldsym(int fileid, int cmd, void *data); }
 338	MSTD	{ int jail(struct jail *jail); }
 339	UNIMPL	pioctl
 340	MSTD	{ int sigprocmask(int how, const sigset_t *set, \
@@ -534,7 +534,7 @@
 		    const char *attrname); }
 374	MSTD	{ int __setugid(int flag); }
 375	NOIMPL	{ int nfsclnt(int flag, caddr_t argp); }
-376	STD	{ int eaccess(char *path, int flags); }
+376	MSTD	{ int eaccess(char *path, int flags); }
 377	UNIMPL	afs_syscall
 378	MSTD	{ int nmount(struct iovec *iovp, unsigned int iovcnt, \
 		    int flags); }
@@ -555,16 +555,16 @@
 		    struct mac *mac_p); }
 390	STD	{ int kenv(int what, const char *name, char *value, \
 		    int len); }
-391	STD	{ int lchflags(const char *path, int flags); }
+391	MSTD	{ int lchflags(const char *path, int flags); }
 392	MSTD	{ int uuidgen(struct uuid *store, int count); }
 393	MSTD	{ int sendfile(int fd, int s, off_t offset, size_t nbytes, \
 		    struct sf_hdtr *hdtr, off_t *sbytes, int flags); }
 394	MSTD	{ int mac_syscall(const char *policy, int call, \
 		    void *arg); }
-395	STD	{ int getfsstat(struct statfs *buf, long bufsize, \
+395	MSTD	{ int getfsstat(struct statfs *buf, long bufsize, \
 		    int flags); }
-396	STD	{ int statfs(char *path, struct statfs *buf); }
-397	STD	{ int fstatfs(int fd, struct statfs *buf); }
+396	MSTD	{ int statfs(char *path, struct statfs *buf); }
+397	MSTD	{ int fstatfs(int fd, struct statfs *buf); }
 398	STD	{ int fhstatfs(const struct fhandle *u_fhp, \
 		    struct statfs *buf); }
 399	UNIMPL	nosys