[src/trunk]: src/sys/fs/ptyfs Always do the chroot filename mapping; it is po...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/747afa6b1f6d
branches:  trunk
changeset: 781628:747afa6b1f6d
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 18 21:33:55 2012 +0000

description:
Always do the chroot filename mapping; it is pointless not to do it.

diffstat:

 sys/fs/ptyfs/ptyfs.h        |  7 +------
 sys/fs/ptyfs/ptyfs_vfsops.c |  7 +++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r 903f74e165fa -r 747afa6b1f6d sys/fs/ptyfs/ptyfs.h
--- a/sys/fs/ptyfs/ptyfs.h      Tue Sep 18 19:45:46 2012 +0000
+++ b/sys/fs/ptyfs/ptyfs.h      Tue Sep 18 21:33:55 2012 +0000
@@ -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
@@ -124,11 +124,6 @@
 
 #define PTYFS_ARGSVERSION      2
 
-#define PTYFSMNT_CHROOT                0x01
-
-#define PTYFSMNT_BITS "\177\20" \
-    "b\00chroot\0"
-
 /*
  * Kernel stuff follows
  */
diff -r 903f74e165fa -r 747afa6b1f6d sys/fs/ptyfs/ptyfs_vfsops.c
--- a/sys/fs/ptyfs/ptyfs_vfsops.c       Tue Sep 18 19:45:46 2012 +0000
+++ b/sys/fs/ptyfs/ptyfs_vfsops.c       Tue Sep 18 21:33:55 2012 +0000
@@ -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);