summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-08-14 03:52:27 +0000
committerkato <kato@FreeBSD.org>1997-08-14 03:52:27 +0000
commita9c600c63035342e94d798348c02629f4d112a2b (patch)
treeb50f46244504b6405a78724d86cd2e4cbe9b5767 /sys/fs
parent51ac279382827515917913557b38c1d59ebf868e (diff)
downloadFreeBSD-src-a9c600c63035342e94d798348c02629f4d112a2b.zip
FreeBSD-src-a9c600c63035342e94d798348c02629f4d112a2b.tar.gz
Backed out part of previous change. The example of -b mount in
manpage works again.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/unionfs/union_vnops.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 3132dd1..d8cb8ee 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.34 1997/05/07 14:37:32 kato Exp $
+ * $Id: union_vnops.c,v 1.35 1997/08/12 07:18:59 kato Exp $
*/
#include <sys/param.h>
@@ -286,9 +286,7 @@ union_lookup(ap)
/*if (uppervp == upperdvp)
dun->un_flags |= UN_KLOCK;*/
- if (cnp->cn_consume != 0 || uerror == EACCES) {
- if (uerror == EACCES)
- uppervp = NULLVP;
+ if (cnp->cn_consume != 0) {
*ap->a_vpp = uppervp;
if (!lockparent)
cnp->cn_flags &= ~LOCKPARENT;
OpenPOWER on IntegriCloud