Tue Sep 18 21:33:55 2012 UTC ()
Always do the chroot filename mapping; it is pointless not to do it.


(christos)
diff -r1.8 -r1.9 src/sys/fs/ptyfs/ptyfs.h
diff -r1.42 -r1.43 src/sys/fs/ptyfs/ptyfs_vfsops.c

cvs diff -r1.8 -r1.9 src/sys/fs/ptyfs/ptyfs.h (expand / switch to context diff)
--- src/sys/fs/ptyfs/ptyfs.h 2009/03/15 16:43:55 1.8
+++ src/sys/fs/ptyfs/ptyfs.h 2012/09/18 21:33:55 1.9
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptyfs.h,v 1.8 2009/03/15 16:43:55 christos Exp $	*/
+/*	$NetBSD: ptyfs.h,v 1.9 2012/09/18 21:33:55 christos Exp $	*/
 
 /*
  * Copyright (c) 1993
@@ -123,11 +123,6 @@
 };
 
 #define PTYFS_ARGSVERSION	2
-
-#define PTYFSMNT_CHROOT		0x01
-
-#define PTYFSMNT_BITS "\177\20" \
-    "b\00chroot\0"
 
 /*
  * Kernel stuff follows

cvs diff -r1.42 -r1.43 src/sys/fs/ptyfs/ptyfs_vfsops.c (expand / switch to context diff)
--- src/sys/fs/ptyfs/ptyfs_vfsops.c 2010/01/08 11:35:09 1.42
+++ src/sys/fs/ptyfs/ptyfs_vfsops.c 2012/09/18 21:33:55 1.43
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $	*/
+/*	$NetBSD: ptyfs_vfsops.c,v 1.43 2012/09/18 21:33:55 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1995
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.43 2012/09/18 21:33:55 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -104,8 +104,7 @@
 	struct ptyfsmount *pmnt = mp->mnt_data;
 
 	rv = mp->mnt_stat.f_mntonname;
-	if (cwdi->cwdi_rdir == NULL ||
-	    (pmnt->pmnt_flags & PTYFSMNT_CHROOT) == 0)
+	if (cwdi->cwdi_rdir == NULL)
 		return rv;
 
 	buf = malloc(MAXBUF, M_TEMP, M_WAITOK);