Module Name: src
Committed By: dennis
Date: Fri Jan 16 21:41:07 UTC 2015
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.25 -r1.26 src/sys/rump/include/rump/rump_namei.h
cvs rdiff -u -r1.91 -r1.92 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.25 src/sys/rump/include/rump/rump_namei.h:1.26
--- src/sys/rump/include/rump/rump_namei.h:1.25 Wed Dec 24 19:56:49 2014
+++ src/sys/rump/include/rump/rump_namei.h Fri Jan 16 21:41:07 2015
@@ -1,11 +1,11 @@
-/* $NetBSD: rump_namei.h,v 1.25 2014/12/24 19:56:49 dennis Exp $ */
+/* $NetBSD: rump_namei.h,v 1.26 2015/01/16 21:41:07 dennis 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.34 2014/12/24 19:50:04 dennis Exp
+ * from: NetBSD: namei.src,v 1.35 2015/01/16 21:38:26 dennis Exp
*/
#ifndef _RUMP_RUMP_NAMEI_H_
Index: src/sys/sys/namei.h
diff -u src/sys/sys/namei.h:1.91 src/sys/sys/namei.h:1.92
--- src/sys/sys/namei.h:1.91 Wed Dec 24 19:56:49 2014
+++ src/sys/sys/namei.h Fri Jan 16 21:41:07 2015
@@ -1,11 +1,11 @@
-/* $NetBSD: namei.h,v 1.91 2014/12/24 19:56:49 dennis Exp $ */
+/* $NetBSD: namei.h,v 1.92 2015/01/16 21:41:07 dennis 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.34 2014/12/24 19:50:04 dennis Exp
+ * from: NetBSD: namei.src,v 1.35 2015/01/16 21:38:26 dennis Exp
*/
/*
@@ -85,6 +85,26 @@ void pathbuf_stringcopy_put(struct pathb
int pathbuf_maybe_copyin(const char *userpath, enum uio_seg seg, struct pathbuf **ret);
/*
+ * Lookup parameters: this structure describes the subset of
+ * information from the nameidata structure that is passed
+ * through the VOP interface.
+ */
+struct componentname {
+ /*
+ * Arguments to lookup.
+ */
+ uint32_t cn_nameiop; /* namei operation */
+ uint32_t cn_flags; /* flags to namei */
+ kauth_cred_t cn_cred; /* credentials */
+ /*
+ * Shared between lookup and commit routines.
+ */
+ const char *cn_nameptr; /* pointer to looked up name */
+ size_t cn_namelen; /* length of looked up comp */
+ size_t cn_consume; /* chars to consume in lookup */
+};
+
+/*
* Encapsulation of namei parameters.
*/
struct nameidata {
@@ -115,20 +135,7 @@ struct nameidata {
* information from the nameidata structure that is passed
* through the VOP interface.
*/
- struct componentname {
- /*
- * Arguments to lookup.
- */
- uint32_t cn_nameiop; /* namei operation */
- uint32_t cn_flags; /* flags to namei */
- kauth_cred_t cn_cred; /* credentials */
- /*
- * Shared between lookup and commit routines.
- */
- const char *cn_nameptr; /* pointer to looked up name */
- size_t cn_namelen; /* length of looked up comp */
- size_t cn_consume; /* chars to consume in lookup */
- } ni_cnd;
+ struct componentname ni_cnd;
};
/*
@@ -229,8 +236,8 @@ struct cpu_info;
extern pool_cache_t pnbuf_cache; /* pathname buffer cache */
-#define PNBUF_GET() pool_cache_get(pnbuf_cache, PR_WAITOK)
-#define PNBUF_PUT(pnb) pool_cache_put(pnbuf_cache, (pnb))
+#define PNBUF_GET() ((char *)pool_cache_get(pnbuf_cache, PR_WAITOK))
+#define PNBUF_PUT(pnb) pool_cache_put(pnbuf_cache, (void *)(pnb))
/*
* Typesafe flags for namei_simple/nameiat_simple.
