Fri Jan 7 11:25:43 2011 UTC ()
regen: fix PARAMASK


(pooka)
diff -r1.13 -r1.14 src/sys/rump/include/rump/rump_namei.h
diff -r1.74 -r1.75 src/sys/sys/namei.h
cvs diff -r1.13 -r1.14 src/sys/rump/include/rump/rump_namei.h (expand / switch to unified diff)

--- src/sys/rump/include/rump/rump_namei.h 2011/01/02 05:12:57 1.13
+++ src/sys/rump/include/rump/rump_namei.h 2011/01/07 11:25:43 1.14
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1/* $NetBSD: rump_namei.h,v 1.13 2011/01/02 05:12:57 dholland Exp $ */ 1/* $NetBSD: rump_namei.h,v 1.14 2011/01/07 11:25:43 pooka Exp $ */
2 2
3 3
4/* 4/*
5 * WARNING: GENERATED FILE. DO NOT EDIT 5 * WARNING: GENERATED FILE. DO NOT EDIT
6 * (edit namei.src and run make namei in src/sys/sys) 6 * (edit namei.src and run make namei in src/sys/sys)
7 * by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp  7 * by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp
8 * from: NetBSD: namei.src,v 1.21 2011/01/02 05:12:33 dholland Exp  8 * from: NetBSD: namei.src,v 1.22 2011/01/07 11:25:10 pooka Exp
9 */ 9 */
10 10
11#ifndef _RUMP_RUMP_NAMEI_H_ 11#ifndef _RUMP_RUMP_NAMEI_H_
12#define _RUMP_RUMP_NAMEI_H_ 12#define _RUMP_RUMP_NAMEI_H_
13 13
14#define RUMP_NAMEI_LOOKUP 0 14#define RUMP_NAMEI_LOOKUP 0
15#define RUMP_NAMEI_CREATE 1 15#define RUMP_NAMEI_CREATE 1
16#define RUMP_NAMEI_DELETE 2 16#define RUMP_NAMEI_DELETE 2
17#define RUMP_NAMEI_RENAME 3 17#define RUMP_NAMEI_RENAME 3
18#define RUMP_NAMEI_OPMASK 3 18#define RUMP_NAMEI_OPMASK 3
19#define RUMP_NAMEI_LOCKLEAF 0x00000004 19#define RUMP_NAMEI_LOCKLEAF 0x00000004
20#define RUMP_NAMEI_LOCKPARENT 0x00000008 20#define RUMP_NAMEI_LOCKPARENT 0x00000008
21#define RUMP_NAMEI_TRYEMULROOT 0x00000010 21#define RUMP_NAMEI_TRYEMULROOT 0x00000010
@@ -27,16 +27,16 @@ @@ -27,16 +27,16 @@
27#define RUMP_NAMEI_MODMASK 0x010000fc 27#define RUMP_NAMEI_MODMASK 0x010000fc
28#define RUMP_NAMEI_NOCROSSMOUNT 0x0000100 28#define RUMP_NAMEI_NOCROSSMOUNT 0x0000100
29#define RUMP_NAMEI_RDONLY 0x0000200 29#define RUMP_NAMEI_RDONLY 0x0000200
30#define RUMP_NAMEI_ISDOTDOT 0x0002000 30#define RUMP_NAMEI_ISDOTDOT 0x0002000
31#define RUMP_NAMEI_MAKEENTRY 0x0004000 31#define RUMP_NAMEI_MAKEENTRY 0x0004000
32#define RUMP_NAMEI_ISLASTCN 0x0008000 32#define RUMP_NAMEI_ISLASTCN 0x0008000
33#define RUMP_NAMEI_ISSYMLINK 0x0010000 33#define RUMP_NAMEI_ISSYMLINK 0x0010000
34#define RUMP_NAMEI_ISWHITEOUT 0x0020000 34#define RUMP_NAMEI_ISWHITEOUT 0x0020000
35#define RUMP_NAMEI_DOWHITEOUT 0x0040000 35#define RUMP_NAMEI_DOWHITEOUT 0x0040000
36#define RUMP_NAMEI_REQUIREDIR 0x0080000 36#define RUMP_NAMEI_REQUIREDIR 0x0080000
37#define RUMP_NAMEI_CREATEDIR 0x0200000 37#define RUMP_NAMEI_CREATEDIR 0x0200000
38#define RUMP_NAMEI_INRENAME 0x0400000 38#define RUMP_NAMEI_INRENAME 0x0400000
39#define RUMP_NAMEI_INRELOOKUP 0x0800000 39#define RUMP_NAMEI_INRELOOKUP 0x0800000
40#define RUMP_NAMEI_PARAMASK 0x0efef00 40#define RUMP_NAMEI_PARAMASK 0x0efe300
41 41
42#endif /* _RUMP_RUMP_NAMEI_H_ */ 42#endif /* _RUMP_RUMP_NAMEI_H_ */
cvs diff -r1.74 -r1.75 src/sys/sys/namei.h (expand / switch to unified diff)

--- src/sys/sys/namei.h 2011/01/02 05:12:56 1.74
+++ src/sys/sys/namei.h 2011/01/07 11:25:43 1.75
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1/* $NetBSD: namei.h,v 1.74 2011/01/02 05:12:56 dholland Exp $ */ 1/* $NetBSD: namei.h,v 1.75 2011/01/07 11:25:43 pooka Exp $ */
2 2
3 3
4/* 4/*
5 * WARNING: GENERATED FILE. DO NOT EDIT 5 * WARNING: GENERATED FILE. DO NOT EDIT
6 * (edit namei.src and run make namei in src/sys/sys) 6 * (edit namei.src and run make namei in src/sys/sys)
7 * by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp  7 * by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp
8 * from: NetBSD: namei.src,v 1.21 2011/01/02 05:12:33 dholland Exp  8 * from: NetBSD: namei.src,v 1.22 2011/01/07 11:25:10 pooka Exp
9 */ 9 */
10 10
11/* 11/*
12 * Copyright (c) 1985, 1989, 1991, 1993 12 * Copyright (c) 1985, 1989, 1991, 1993
13 * The Regents of the University of California. All rights reserved. 13 * The Regents of the University of California. All rights reserved.
14 * 14 *
15 * Redistribution and use in source and binary forms, with or without 15 * Redistribution and use in source and binary forms, with or without
16 * modification, are permitted provided that the following conditions 16 * modification, are permitted provided that the following conditions
17 * are met: 17 * are met:
18 * 1. Redistributions of source code must retain the above copyright 18 * 1. Redistributions of source code must retain the above copyright
19 * notice, this list of conditions and the following disclaimer. 19 * notice, this list of conditions and the following disclaimer.
20 * 2. Redistributions in binary form must reproduce the above copyright 20 * 2. Redistributions in binary form must reproduce the above copyright
21 * notice, this list of conditions and the following disclaimer in the 21 * notice, this list of conditions and the following disclaimer in the
@@ -159,27 +159,27 @@ struct nameidata { @@ -159,27 +159,27 @@ struct nameidata {
159 */ 159 */
160#define NOCROSSMOUNT 0x0000100 /* do not cross mount points */ 160#define NOCROSSMOUNT 0x0000100 /* do not cross mount points */
161#define RDONLY 0x0000200 /* lookup with read-only semantics */ 161#define RDONLY 0x0000200 /* lookup with read-only semantics */
162#define ISDOTDOT 0x0002000 /* current component name is .. */ 162#define ISDOTDOT 0x0002000 /* current component name is .. */
163#define MAKEENTRY 0x0004000 /* entry is to be added to name cache */ 163#define MAKEENTRY 0x0004000 /* entry is to be added to name cache */
164#define ISLASTCN 0x0008000 /* this is last component of pathname */ 164#define ISLASTCN 0x0008000 /* this is last component of pathname */
165#define ISSYMLINK 0x0010000 /* symlink needs interpretation */ 165#define ISSYMLINK 0x0010000 /* symlink needs interpretation */
166#define ISWHITEOUT 0x0020000 /* found whiteout */ 166#define ISWHITEOUT 0x0020000 /* found whiteout */
167#define DOWHITEOUT 0x0040000 /* do whiteouts */ 167#define DOWHITEOUT 0x0040000 /* do whiteouts */
168#define REQUIREDIR 0x0080000 /* must be a directory */ 168#define REQUIREDIR 0x0080000 /* must be a directory */
169#define CREATEDIR 0x0200000 /* trailing slashes are ok */ 169#define CREATEDIR 0x0200000 /* trailing slashes are ok */
170#define INRENAME 0x0400000 /* operation is a part of ``rename'' */ 170#define INRENAME 0x0400000 /* operation is a part of ``rename'' */
171#define INRELOOKUP 0x0800000 /* set while inside relookup() */ 171#define INRELOOKUP 0x0800000 /* set while inside relookup() */
172#define PARAMASK 0x0efef00 /* mask of parameter descriptors */ 172#define PARAMASK 0x0efe300 /* mask of parameter descriptors */
173 173
174/* 174/*
175 * Initialization of an nameidata structure. 175 * Initialization of an nameidata structure.
176 */ 176 */
177#define NDINIT(ndp, op, flags, pathbuf) { \ 177#define NDINIT(ndp, op, flags, pathbuf) { \
178 (ndp)->ni_cnd.cn_nameiop = op; \ 178 (ndp)->ni_cnd.cn_nameiop = op; \
179 (ndp)->ni_cnd.cn_flags = flags; \ 179 (ndp)->ni_cnd.cn_flags = flags; \
180 (ndp)->ni_pathbuf = pathbuf; \ 180 (ndp)->ni_pathbuf = pathbuf; \
181 (ndp)->ni_cnd.cn_cred = kauth_cred_get(); \ 181 (ndp)->ni_cnd.cn_cred = kauth_cred_get(); \
182} 182}
183#endif 183#endif
184 184
185/* 185/*
@@ -316,16 +316,16 @@ extern struct nchstats nchstats; @@ -316,16 +316,16 @@ extern struct nchstats nchstats;
316#define NAMEI_MODMASK 0x010000fc 316#define NAMEI_MODMASK 0x010000fc
317#define NAMEI_NOCROSSMOUNT 0x0000100 317#define NAMEI_NOCROSSMOUNT 0x0000100
318#define NAMEI_RDONLY 0x0000200 318#define NAMEI_RDONLY 0x0000200
319#define NAMEI_ISDOTDOT 0x0002000 319#define NAMEI_ISDOTDOT 0x0002000
320#define NAMEI_MAKEENTRY 0x0004000 320#define NAMEI_MAKEENTRY 0x0004000
321#define NAMEI_ISLASTCN 0x0008000 321#define NAMEI_ISLASTCN 0x0008000
322#define NAMEI_ISSYMLINK 0x0010000 322#define NAMEI_ISSYMLINK 0x0010000
323#define NAMEI_ISWHITEOUT 0x0020000 323#define NAMEI_ISWHITEOUT 0x0020000
324#define NAMEI_DOWHITEOUT 0x0040000 324#define NAMEI_DOWHITEOUT 0x0040000
325#define NAMEI_REQUIREDIR 0x0080000 325#define NAMEI_REQUIREDIR 0x0080000
326#define NAMEI_CREATEDIR 0x0200000 326#define NAMEI_CREATEDIR 0x0200000
327#define NAMEI_INRENAME 0x0400000 327#define NAMEI_INRENAME 0x0400000
328#define NAMEI_INRELOOKUP 0x0800000 328#define NAMEI_INRELOOKUP 0x0800000
329#define NAMEI_PARAMASK 0x0efef00 329#define NAMEI_PARAMASK 0x0efe300
330 330
331#endif /* !_SYS_NAMEI_H_ */ 331#endif /* !_SYS_NAMEI_H_ */