1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
$NetBSD: patch-af,v 1.14 2009/05/17 20:40:46 seb Exp $
--- dialects/n+obsd/dlsof.h.orig 2006-03-28 21:54:15.000000000 +0000
+++ dialects/n+obsd/dlsof.h
@@ -95,6 +95,10 @@ struct uio; /* dummy for function protot
# endif /* (defined(OPENBSDV) && OPENBSDV<3030)
|| (defined(NETBSDV) && __NetBSD_Version__>=106060000) */
+# if defined(NETBSDV) && NETBSDV>=1003000
+#define sockproto NETBSD_sockproto
+# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
+
#include <sys/mount.h>
# if (defined(OPENBSDV) && OPENBSDV>=3030) \
@@ -106,10 +110,6 @@ struct uio; /* dummy for function protot
#include <rpc/types.h>
#include <sys/protosw.h>
-# if defined(NETBSDV) && NETBSDV>=1003000
-#define sockproto NETBSD_sockproto
-# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
-
#include <sys/socket.h>
# if defined(HASMSDOSFS)
@@ -161,6 +161,7 @@ struct nameidata; /* to satisfy a functi
#include <sys/socketvar.h>
#include <sys/un.h>
#include <sys/unpcb.h>
+#include <net/route.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
@@ -170,7 +171,6 @@ struct nameidata; /* to satisfy a functi
#include <netinet6/in6_pcb.h>
# endif /* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
-#include <net/route.h>
#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
@@ -264,6 +264,9 @@ struct sockproto {
#undef KERNEL
#include <ufs/mfs/mfsnode.h>
+# if defined(HASTMPFS)
+#include <fs/tmpfs/tmpfs.h>
+# endif /* defined(HASTMPFS) */
# if defined(HASNFSPROTO)
#include <nfs/rpcv2.h>
@@ -489,7 +492,12 @@ extern KA_T Kpa;
struct l_vfs {
KA_T addr; /* kernel address */
fsid_t fsid; /* file system ID */
+#if defined(NETBSDV) && __NetBSD_Version__ >= 499002500
+ /* MFSNAMELEN was removed from the kernel source after 4.99.24 */
+ char type[sizeof(((struct statvfs *)NULL)->f_fstypename)]; /* type of file system */
+#else
char type[MFSNAMELEN]; /* type of file system */
+#endif
char *dir; /* mounted directory */
char *fsname; /* file system name */
struct l_vfs *next; /* forward link */
@@ -581,4 +589,12 @@ struct sfile {
# endif /* defined(HASNCVPID) */
# endif /* defined(HASNCACHE) */
+#if defined(VV_ROOT) /* NetBSD >= 4.99.33 */
+#define VNODE_VFLAG v_vflag
+#define NCACHE_VROOT VV_ROOT
+#else
+#define VNODE_VFLAG v_flag
+#define NCACHE_VROOT VROOT
+#endif /* VV_ROOT */
+
#endif /* NETBSD_LSOF_H */
|
