diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-02-28 16:13:25 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-02-28 16:13:25 +0000 |
| commit | a32cf1f06d32a7c60cf160e7887b5d57f8cf57e6 (patch) | |
| tree | cae1103c80e45f4954bde705498aaa1b6f74d3fa | |
| parent | 4adbda97dc9fa795a23ada72594e631c6dda8666 (diff) | |
Notes
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 11 | ||||
| -rw-r--r-- | sys/miscfs/union/union_subr.c | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 7559b6e205fb5..5ced12f6e322a 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $Id: union_subr.c,v 1.35 1998/12/07 21:58:34 archie Exp $ + * $Id: union_subr.c,v 1.36 1998/12/14 05:00:59 dillon Exp $ */ #include <sys/param.h> @@ -1183,15 +1183,6 @@ union_dircheck(struct proc *p, struct vnode **vp, struct file *fp) return -1; /* goto unionread */ } } - if (((*vp)->v_flag & VROOT) && ((*vp)->v_mount->mnt_flag & MNT_UNION)) { - struct vnode *tvp = *vp; - *vp = (*vp)->v_mount->mnt_vnodecovered; - VREF(*vp); - fp->f_data = (caddr_t) *vp; - fp->f_offset = 0; - vrele(tvp); - return -1; /* goto unionread */ - } return error; } diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index 7559b6e205fb5..5ced12f6e322a 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $Id: union_subr.c,v 1.35 1998/12/07 21:58:34 archie Exp $ + * $Id: union_subr.c,v 1.36 1998/12/14 05:00:59 dillon Exp $ */ #include <sys/param.h> @@ -1183,15 +1183,6 @@ union_dircheck(struct proc *p, struct vnode **vp, struct file *fp) return -1; /* goto unionread */ } } - if (((*vp)->v_flag & VROOT) && ((*vp)->v_mount->mnt_flag & MNT_UNION)) { - struct vnode *tvp = *vp; - *vp = (*vp)->v_mount->mnt_vnodecovered; - VREF(*vp); - fp->f_data = (caddr_t) *vp; - fp->f_offset = 0; - vrele(tvp); - return -1; /* goto unionread */ - } return error; } |