diff options
| author | phk <phk@FreeBSD.org> | 2004-11-13 11:53:02 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-11-13 11:53:02 +0000 |
| commit | 216166ee0de39b10ba8e60f4115d65e1251ff29f (patch) | |
| tree | 15f70d195895ba0b6c385bc2892b07302db4faaa /sys/kern/vfs_syscalls.c | |
| parent | 32d92d3a1a6bf10d16cd48469ec464510bd8ff2f (diff) | |
| download | FreeBSD-src-216166ee0de39b10ba8e60f4115d65e1251ff29f.zip FreeBSD-src-216166ee0de39b10ba8e60f4115d65e1251ff29f.tar.gz | |
Introduce an alias for FILEDESC_{UN}LOCK() with the suffix _FAST.
Use this in all the places where sleeping with the lock held is not
an issue.
The distinction will become significant once we finalize the exact
lock-type to use for this kind of case.
Diffstat (limited to 'sys/kern/vfs_syscalls.c')
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index d98a885..d006e3f 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -702,10 +702,10 @@ fchdir(td, uap) return (error); } VOP_UNLOCK(vp, 0, td); - FILEDESC_LOCK(fdp); + FILEDESC_LOCK_FAST(fdp); vpold = fdp->fd_cdir; fdp->fd_cdir = vp; - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK_FAST(fdp); vrele(vpold); return (0); } @@ -747,10 +747,10 @@ kern_chdir(struct thread *td, char *path, enum uio_seg pathseg) } VOP_UNLOCK(nd.ni_vp, 0, td); NDFREE(&nd, NDF_ONLY_PNBUF); - FILEDESC_LOCK(fdp); + FILEDESC_LOCK_FAST(fdp); vp = fdp->fd_cdir; fdp->fd_cdir = nd.ni_vp; - FILEDESC_UNLOCK(fdp); + FILEDESC_UNLOCK_FAST(fdp); vrele(vp); return (0); } @@ -1175,10 +1175,10 @@ restart: return (EEXIST); } else { VATTR_NULL(&vattr); - FILEDESC_LOCK(td->td_proc->p_fd); + FILEDESC_LOCK_FAST(td->td_proc->p_fd); vattr.va_mode = (mode & ALLPERMS) & ~td->td_proc->p_fd->fd_cmask; - FILEDESC_UNLOCK(td->td_proc->p_fd); + FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); vattr.va_rdev = dev; whiteout = 0; @@ -1283,9 +1283,9 @@ restart: } VATTR_NULL(&vattr); vattr.va_type = VFIFO; - FILEDESC_LOCK(td->td_proc->p_fd); + FILEDESC_LOCK_FAST(td->td_proc->p_fd); vattr.va_mode = (mode & ALLPERMS) & ~td->td_proc->p_fd->fd_cmask; - FILEDESC_UNLOCK(td->td_proc->p_fd); + FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); #ifdef MAC error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); @@ -1487,9 +1487,9 @@ restart: goto restart; } VATTR_NULL(&vattr); - FILEDESC_LOCK(td->td_proc->p_fd); + FILEDESC_LOCK_FAST(td->td_proc->p_fd); vattr.va_mode = ACCESSPERMS &~ td->td_proc->p_fd->fd_cmask; - FILEDESC_UNLOCK(td->td_proc->p_fd); + FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); #ifdef MAC vattr.va_type = VLNK; error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, @@ -3254,9 +3254,9 @@ restart: } VATTR_NULL(&vattr); vattr.va_type = VDIR; - FILEDESC_LOCK(td->td_proc->p_fd); + FILEDESC_LOCK_FAST(td->td_proc->p_fd); vattr.va_mode = (mode & ACCESSPERMS) &~ td->td_proc->p_fd->fd_cmask; - FILEDESC_UNLOCK(td->td_proc->p_fd); + FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); #ifdef MAC error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); @@ -3658,11 +3658,11 @@ umask(td, uap) { register struct filedesc *fdp; - FILEDESC_LOCK(td->td_proc->p_fd); + FILEDESC_LOCK_FAST(td->td_proc->p_fd); fdp = td->td_proc->p_fd; td->td_retval[0] = fdp->fd_cmask; fdp->fd_cmask = uap->newmask & ALLPERMS; - FILEDESC_UNLOCK(td->td_proc->p_fd); + FILEDESC_UNLOCK_FAST(td->td_proc->p_fd); return (0); } |
