diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 17 | ||||
| -rw-r--r-- | sys/xfs/xfs_vopdefs.h | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 16beb9fe3e1..47880fd6935 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.122 2005/05/27 17:31:47 pedro Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.123 2005/05/27 20:20:23 pedro Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -1220,7 +1220,6 @@ sys_mknod(p, v, retval) register struct vnode *vp; struct vattr vattr; int error; - int whiteout = 0; struct nameidata nd; if ((error = suser(p, 0)) != 0) @@ -1237,7 +1236,6 @@ sys_mknod(p, v, retval) VATTR_NULL(&vattr); vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ p->p_fd->fd_cmask; vattr.va_rdev = SCARG(uap, dev); - whiteout = 0; switch (SCARG(uap, mode) & S_IFMT) { case S_IFMT: /* used by badsect to flag bad sectors */ @@ -1249,9 +1247,6 @@ sys_mknod(p, v, retval) case S_IFBLK: vattr.va_type = VBLK; break; - case S_IFWHT: - whiteout = 1; - break; default: error = EINVAL; break; @@ -1259,15 +1254,7 @@ sys_mknod(p, v, retval) } if (!error) { VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE); - if (whiteout) { - error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, CREATE); - if (error) - VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd); - vput(nd.ni_dvp); - } else { - error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, - &nd.ni_cnd, &vattr); - } + error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); } else { VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd); if (nd.ni_dvp == vp) diff --git a/sys/xfs/xfs_vopdefs.h b/sys/xfs/xfs_vopdefs.h index 401a4015727..ff55633d625 100644 --- a/sys/xfs/xfs_vopdefs.h +++ b/sys/xfs/xfs_vopdefs.h @@ -68,8 +68,6 @@ NNPFS_VOP_DEF(pathconf); NNPFS_VOP_DEF(advlock); #define HAVE_VOP_REALLOCBLKS 1 NNPFS_VOP_DEF(reallocblks); -#define HAVE_VOP_WHITEOUT 1 -NNPFS_VOP_DEF(whiteout); #define HAVE_VOP_GETEXTATTR 1 NNPFS_VOP_DEF(getextattr); #define HAVE_VOP_SETEXTATTR 1 |