Thu Aug 15 21:00:56 2013 UTC ()
revert pending fix: MAXNAMLEN causes trouble


(pooka)
diff -r1.23 -r1.24 src/sys/rump/include/rump/rumpdefs.h
cvs diff -r1.23 -r1.24 src/sys/rump/include/rump/rumpdefs.h (expand / switch to unified diff)

--- src/sys/rump/include/rump/rumpdefs.h 2013/08/15 20:45:38 1.23
+++ src/sys/rump/include/rump/rumpdefs.h 2013/08/15 21:00:56 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rumpdefs.h,v 1.23 2013/08/15 20:45:38 pooka Exp $ */ 1/* $NetBSD: rumpdefs.h,v 1.24 2013/08/15 21:00:56 pooka Exp $ */
2 2
3/* 3/*
4 * AUTOMATICALLY GENERATED. DO NOT EDIT. 4 * AUTOMATICALLY GENERATED. DO NOT EDIT.
5 */ 5 */
6 6
7#ifndef _RUMP_RUMPDEFS_H_ 7#ifndef _RUMP_RUMPDEFS_H_
8#define _RUMP_RUMPDEFS_H_ 8#define _RUMP_RUMPDEFS_H_
9 9
10#include <rump/rump_namei.h> 10#include <rump/rump_namei.h>
11 11
12/* NetBSD: fcntl.h,v 1.45 2013/01/13 08:15:03 dholland Exp */ 12/* NetBSD: fcntl.h,v 1.45 2013/01/13 08:15:03 dholland Exp */
13#define RUMP_O_RDONLY 0x00000000 /* open for reading only */ 13#define RUMP_O_RDONLY 0x00000000 /* open for reading only */
14#define RUMP_O_WRONLY 0x00000001 /* open for writing only */ 14#define RUMP_O_WRONLY 0x00000001 /* open for writing only */
@@ -285,27 +285,27 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,  @@ -285,27 +285,27 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
285#define RUMP_MSG_DONTWAIT 0x0080  285#define RUMP_MSG_DONTWAIT 0x0080
286#define RUMP_MSG_BCAST 0x0100  286#define RUMP_MSG_BCAST 0x0100
287#define RUMP_MSG_MCAST 0x0200  287#define RUMP_MSG_MCAST 0x0200
288#define RUMP_MSG_NOSIGNAL 0x0400  288#define RUMP_MSG_NOSIGNAL 0x0400
289#define RUMP_MSG_CRUMP_MSG_CLOEXEC 0x0800  289#define RUMP_MSG_CRUMP_MSG_CLOEXEC 0x0800
290#define RUMP_MSG_NBIO 0x1000  290#define RUMP_MSG_NBIO 0x1000
291#define RUMP_MSG_WAITFORONE 0x2000  291#define RUMP_MSG_WAITFORONE 0x2000
292#define RUMP_MSG_USERFLAGS 0x0ffffff 292#define RUMP_MSG_USERFLAGS 0x0ffffff
293#define RUMP_MSG_NAMEMBUF 0x1000000  293#define RUMP_MSG_NAMEMBUF 0x1000000
294#define RUMP_MSG_CONTROLMBUF 0x2000000  294#define RUMP_MSG_CONTROLMBUF 0x2000000
295#define RUMP_MSG_IOVUSRSPACE 0x4000000  295#define RUMP_MSG_IOVUSRSPACE 0x4000000
296#define RUMP_MSG_LENUSRSPACE 0x8000000  296#define RUMP_MSG_LENUSRSPACE 0x8000000
297 297
298/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */ 298/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */
299#define RUMP_IP_OPTIONS 1  299#define RUMP_IP_OPTIONS 1
300#define RUMP_IP_HDRINCL 2  300#define RUMP_IP_HDRINCL 2
301#define RUMP_IP_TOS 3  301#define RUMP_IP_TOS 3
302#define RUMP_IP_TTL 4  302#define RUMP_IP_TTL 4
303#define RUMP_IP_RECVOPTS 5  303#define RUMP_IP_RECVOPTS 5
304#define RUMP_IP_RECVRETOPTS 6  304#define RUMP_IP_RECVRETOPTS 6
305#define RUMP_IP_RECVDSTADDR 7  305#define RUMP_IP_RECVDSTADDR 7
306#define RUMP_IP_RETOPTS 8  306#define RUMP_IP_RETOPTS 8
307#define RUMP_IP_MULTICAST_IF 9  307#define RUMP_IP_MULTICAST_IF 9
308#define RUMP_IP_MULTICAST_TTL 10  308#define RUMP_IP_MULTICAST_TTL 10
309#define RUMP_IP_MULTICAST_LOOP 11  309#define RUMP_IP_MULTICAST_LOOP 11
310#define RUMP_IP_ADD_MEMBERSHIP 12  310#define RUMP_IP_ADD_MEMBERSHIP 12
311#define RUMP_IP_DROP_MEMBERSHIP 13  311#define RUMP_IP_DROP_MEMBERSHIP 13
@@ -470,37 +470,24 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,  @@ -470,37 +470,24 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
470#define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t)) 470#define _RUMP_IOW(g,n,t) _RUMP_IOC(RUMP_IOC_IN, (g), (n), sizeof(t))
471#define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t)) 471#define _RUMP_IOWR(g,n,t) _RUMP_IOC(RUMP_IOC_INOUT, (g), (n), sizeof(t))
472 472
473/* NetBSD: module.h,v 1.32 2012/10/17 17:48:48 dyoung Exp */ 473/* NetBSD: module.h,v 1.32 2012/10/17 17:48:48 dyoung Exp */
474struct rump_modctl_load { 474struct rump_modctl_load {
475 const char *ml_filename; 475 const char *ml_filename;
476 476
477 int ml_flags; 477 int ml_flags;
478 478
479 const char *ml_props; 479 const char *ml_props;
480 size_t ml_propslen; 480 size_t ml_propslen;
481}; 481};
482 482
483/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */ 483/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */
484struct rump_ufs_args { 484struct rump_ufs_args {
485 char *fspec; /* block special device to mount */ 485 char *fspec; /* block special device to mount */
486}; 486};
487 487
488/* NetBSD: sysvbfs_args.h,v 1.1 2008/09/04 12:07:30 pooka Exp */ 488/* NetBSD: sysvbfs_args.h,v 1.1 2008/09/04 12:07:30 pooka Exp */
489struct rump_sysvbfs_args { 489struct rump_sysvbfs_args {
490 char *fspec; /* blocks special holding the fs to mount */ 490 char *fspec; /* blocks special holding the fs to mount */
491}; 491};
492 492
493/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */ 
494struct rump_dirent { 
495 ino_t d_fileno; /* file number of entry */ 
496 uint16_t d_reclen; /* length of this record */ 
497 uint16_t d_namlen; /* length of string in d_name */ 
498 uint8_t d_type; /* file type, see below */ 
499#if defined(_NETBSD_SOURCE) 
500 char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ 
501#else 
502 char d_name[511 + 1]; /* name must be no longer than this */ 
503#endif 
504}; 
505 
506#endif /* _RUMP_RUMPDEFS_H_ */ 493#endif /* _RUMP_RUMPDEFS_H_ */