Module Name: src
Committed By: christos
Date: Tue Sep 18 21:33:55 UTC 2012
Modified Files:
src/sys/fs/ptyfs: ptyfs.h ptyfs_vfsops.c
Log Message:
Always do the chroot filename mapping; it is pointless not to do it.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/fs/ptyfs/ptyfs.h
cvs rdiff -u -r1.42 -r1.43 src/sys/fs/ptyfs/ptyfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/ptyfs/ptyfs.h
diff -u src/sys/fs/ptyfs/ptyfs.h:1.8 src/sys/fs/ptyfs/ptyfs.h:1.9
--- src/sys/fs/ptyfs/ptyfs.h:1.8 Sun Mar 15 12:43:55 2009
+++ src/sys/fs/ptyfs/ptyfs.h Tue Sep 18 17:33:55 2012
@@ -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 @@ struct ptyfs_args {
#define PTYFS_ARGSVERSION 2
-#define PTYFSMNT_CHROOT 0x01
-
-#define PTYFSMNT_BITS "\177\20" \
- "b\00chroot\0"
-
/*
* Kernel stuff follows
*/
Index: src/sys/fs/ptyfs/ptyfs_vfsops.c
diff -u src/sys/fs/ptyfs/ptyfs_vfsops.c:1.42 src/sys/fs/ptyfs/ptyfs_vfsops.c:1.43
--- src/sys/fs/ptyfs/ptyfs_vfsops.c:1.42 Fri Jan 8 06:35:09 2010
+++ src/sys/fs/ptyfs/ptyfs_vfsops.c Tue Sep 18 17:33:55 2012
@@ -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 @@ ptyfs__getpath(struct lwp *l, const stru
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);
