summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authorPedro Martelletto <pedro@cvs.openbsd.org>2005-05-26 00:33:46 +0000
committerPedro Martelletto <pedro@cvs.openbsd.org>2005-05-26 00:33:46 +0000
commit6076db144c5ee267e42bff4d3f33bdd00abc389b (patch)
tree432c2b93feff2d11d747476687927cf20509a508 /sys/compat/linux
parent40b0596b9aa87e81b667caabb171ebbb23994418 (diff)
RIP stackable filesystems, ok marius@ tedu@, discussed with deraadt@
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/linux_getcwd.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c
index 5fe168f12f0..8038ca2c9cf 100644
--- a/sys/compat/linux/linux_getcwd.c
+++ b/sys/compat/linux/linux_getcwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_getcwd.c,v 1.5 2004/08/03 12:10:47 todd Exp $ */
+/* $OpenBSD: linux_getcwd.c,v 1.6 2005/05/26 00:33:45 pedro Exp $ */
/* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
/*-
@@ -268,27 +268,7 @@ unionread:
}
}
} while (!eofflag);
-#if 0
- /*
- * Deal with mount -o union, which unions only the
- * root directory of the mount.
- */
- if ((uvp->v_flag & VROOT) &&
- (uvp->v_mount->mnt_flag & MNT_UNION)) {
- struct vnode *tvp = uvp;
- uvp = uvp->v_mount->mnt_vnodecovered;
- vput(tvp);
- VREF(uvp);
- *uvpp = uvp;
- error = vn_lock(uvp, LK_EXCLUSIVE | LK_RETRY);
- if (error != 0) {
- vrele(uvp);
- *uvpp = uvp = NULL;
- goto out;
- }
- goto unionread;
- }
-#endif
+
error = ENOENT;
out: