Module Name: src
Committed By: dholland
Date: Sat Oct 13 17:47:11 UTC 2012
Modified Files:
src/sys/rump/include/rump: rump_namei.h
src/sys/sys: namei.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/include/rump/rump_namei.h
cvs rdiff -u -r1.81 -r1.82 src/sys/sys/namei.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rump_namei.h
diff -u src/sys/rump/include/rump/rump_namei.h:1.17 src/sys/rump/include/rump/rump_namei.h:1.18
--- src/sys/rump/include/rump/rump_namei.h:1.17 Mon Oct 8 23:44:09 2012
+++ src/sys/rump/include/rump/rump_namei.h Sat Oct 13 17:47:11 2012
@@ -1,11 +1,11 @@
-/* $NetBSD: rump_namei.h,v 1.17 2012/10/08 23:44:09 dholland Exp $ */
+/* $NetBSD: rump_namei.h,v 1.18 2012/10/13 17:47:11 dholland Exp $ */
/*
* WARNING: GENERATED FILE. DO NOT EDIT
* (edit namei.src and run make namei in src/sys/sys)
* by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp
- * from: NetBSD: namei.src,v 1.26 2012/10/08 23:43:33 dholland Exp
+ * from: NetBSD: namei.src,v 1.27 2012/10/13 17:46:50 dholland Exp
*/
#ifndef _RUMP_RUMP_NAMEI_H_
@@ -23,9 +23,8 @@
#define RUMP_NAMEI_FOLLOW 0x00000040
#define RUMP_NAMEI_NOFOLLOW 0x00000000
#define RUMP_NAMEI_EMULROOTSET 0x00000080
-#define RUMP_NAMEI_DIDNDAT 0x00000400
#define RUMP_NAMEI_NOCHROOT 0x01000000
-#define RUMP_NAMEI_MODMASK 0x010004fc
+#define RUMP_NAMEI_MODMASK 0x010000fc
#define RUMP_NAMEI_NOCROSSMOUNT 0x0000100
#define RUMP_NAMEI_RDONLY 0x0000200
#define RUMP_NAMEI_ISDOTDOT 0x0002000
Index: src/sys/sys/namei.h
diff -u src/sys/sys/namei.h:1.81 src/sys/sys/namei.h:1.82
--- src/sys/sys/namei.h:1.81 Mon Oct 8 23:44:09 2012
+++ src/sys/sys/namei.h Sat Oct 13 17:47:11 2012
@@ -1,11 +1,11 @@
-/* $NetBSD: namei.h,v 1.81 2012/10/08 23:44:09 dholland Exp $ */
+/* $NetBSD: namei.h,v 1.82 2012/10/13 17:47:11 dholland Exp $ */
/*
* WARNING: GENERATED FILE. DO NOT EDIT
* (edit namei.src and run make namei in src/sys/sys)
* by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp
- * from: NetBSD: namei.src,v 1.26 2012/10/08 23:43:33 dholland Exp
+ * from: NetBSD: namei.src,v 1.27 2012/10/13 17:46:50 dholland Exp
*/
/*
@@ -91,6 +91,7 @@ struct nameidata {
/*
* Arguments to namei/lookup.
*/
+ struct vnode *ni_startdir; /* starting dir, cwd if null */
struct pathbuf *ni_pathbuf; /* pathname container */
char *ni_pnbuf; /* extra pathname buffer ref (XXX) */
/*
@@ -152,9 +153,8 @@ struct nameidata {
(pseudo) */
#define EMULROOTSET 0x00000080 /* emulation root already
in ni_erootdir */
-#define DIDNDAT 0x00000400 /* did NDAT() (temporary) */
#define NOCHROOT 0x01000000 /* no chroot on abs path lookups */
-#define MODMASK 0x010004fc /* mask of operational modifiers */
+#define MODMASK 0x010000fc /* mask of operational modifiers */
/*
* Namei parameter descriptors.
*/
@@ -177,6 +177,7 @@ struct nameidata {
#define NDINIT(ndp, op, flags, pathbuf) { \
(ndp)->ni_cnd.cn_nameiop = op; \
(ndp)->ni_cnd.cn_flags = flags; \
+ (ndp)->ni_startdir = NULL; \
(ndp)->ni_pathbuf = pathbuf; \
(ndp)->ni_cnd.cn_cred = kauth_cred_get(); \
}
@@ -185,8 +186,7 @@ struct nameidata {
* Use this to set the start directory for openat()-type operations.
*/
#define NDAT(ndp, dir) { \
- (ndp)->ni_cnd.cn_flags |= DIDNDAT; \
- (ndp)->ni_dvp = (dir); \
+ (ndp)->ni_startdir = (dir); \
}
#endif
@@ -321,9 +321,8 @@ extern struct nchstats nchstats;
#define NAMEI_FOLLOW 0x00000040
#define NAMEI_NOFOLLOW 0x00000000
#define NAMEI_EMULROOTSET 0x00000080
-#define NAMEI_DIDNDAT 0x00000400
#define NAMEI_NOCHROOT 0x01000000
-#define NAMEI_MODMASK 0x010004fc
+#define NAMEI_MODMASK 0x010000fc
#define NAMEI_NOCROSSMOUNT 0x0000100
#define NAMEI_RDONLY 0x0000200
#define NAMEI_ISDOTDOT 0x0002000
