summaryrefslogtreecommitdiffstats
path: root/sys/miscfs/union
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-02-28 16:13:25 +0000
committerpeter <peter@FreeBSD.org>1999-02-28 16:13:25 +0000
commit8b661a6175c52791c53885959328643fd46f0b8a (patch)
tree764d6d3a00c09cbfe86bd2129642c43639b8fee4 /sys/miscfs/union
parent24ba3bedb135b53bd66e125fa2e7125c3f3bed1a (diff)
downloadFreeBSD-src-8b661a6175c52791c53885959328643fd46f0b8a.zip
FreeBSD-src-8b661a6175c52791c53885959328643fd46f0b8a.tar.gz
This code got moved as a result of confusion between union mounts and
unionfs. Julian has already revived the union mount part of this move in vfs_syscalls.c rev 1.119, but forgot to take it out of here.
Diffstat (limited to 'sys/miscfs/union')
-rw-r--r--sys/miscfs/union/union_subr.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 7559b6e..5ced12f 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;
}
OpenPOWER on IntegriCloud