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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
Index: zfs-fuse/src/lib/libsolcompat/include/sys/utsname.h
===================================================================
--- zfs-fuse.orig/src/lib/libsolcompat/include/sys/utsname.h
+++ zfs-fuse/src/lib/libsolcompat/include/sys/utsname.h
@@ -29,7 +29,7 @@
#include_next <sys/utsname.h>
-struct utsname utsname;
+extern struct utsname utsname;
#endif
Index: zfs-fuse/src/cmd/zfs/zfs_util.h
===================================================================
--- zfs-fuse.orig/src/cmd/zfs/zfs_util.h
+++ zfs-fuse/src/cmd/zfs/zfs_util.h
@@ -35,7 +35,7 @@ extern "C" {
#endif
void * safe_malloc(size_t size);
-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;
#ifdef __cplusplus
}
Index: zfs-fuse/src/cmd/zpool/zpool_util.h
===================================================================
--- zfs-fuse.orig/src/cmd/zpool/zpool_util.h
+++ zfs-fuse/src/cmd/zpool/zpool_util.h
@@ -64,7 +64,7 @@ void pool_list_free(zpool_list_t *);
int pool_list_count(zpool_list_t *);
void pool_list_remove(zpool_list_t *, zpool_handle_t *);
-libzfs_handle_t *g_zfs;
+extern libzfs_handle_t *g_zfs;
#ifdef __cplusplus
}
Index: zfs-fuse/src/cmd/zpool/zpool_main.c
===================================================================
--- zfs-fuse.orig/src/cmd/zpool/zpool_main.c
+++ zfs-fuse/src/cmd/zpool/zpool_main.c
@@ -181,6 +181,8 @@ static char history_str[HIS_MAX_RECORD_L
static uint_t timestamp_fmt = NODATE;
+libzfs_handle_t *g_zfs;
+
static const char *
get_usage(zpool_help_t idx) {
switch (idx) {
Index: zfs-fuse/src/lib/libzfs/libzfs_zfsfuse.c
===================================================================
--- zfs-fuse.orig/src/lib/libzfs/libzfs_zfsfuse.c
+++ zfs-fuse/src/lib/libzfs/libzfs_zfsfuse.c
@@ -37,8 +37,6 @@
#include "libzfs_impl.h"
-int aok=0;
-
int zfsfuse_open(const char *pathname, int flags)
{
struct sockaddr_un name;
Index: zfs-fuse/src/zfs-fuse/zfs_vnops.c
===================================================================
--- zfs-fuse.orig/src/zfs-fuse/zfs_vnops.c
+++ zfs-fuse/src/zfs-fuse/zfs_vnops.c
@@ -4669,7 +4669,6 @@ zfs_isdir()
/*
* Directory vnode operations template
*/
-vnodeops_t *zfs_dvnodeops;
const fs_operation_def_t zfs_dvnodeops_template[] = {
VOPNAME_OPEN, { .vop_open = zfs_open },
VOPNAME_CLOSE, { .vop_close = zfs_close },
@@ -4702,7 +4701,6 @@ const fs_operation_def_t zfs_dvnodeops_t
/*
* Regular file vnode operations template
*/
-vnodeops_t *zfs_fvnodeops;
const fs_operation_def_t zfs_fvnodeops_template[] = {
VOPNAME_OPEN, { .vop_open = zfs_open },
VOPNAME_CLOSE, { .vop_close = zfs_close },
@@ -4735,7 +4733,6 @@ const fs_operation_def_t zfs_fvnodeops_t
/*
* Symbolic link vnode operations template
*/
-vnodeops_t *zfs_symvnodeops;
const fs_operation_def_t zfs_symvnodeops_template[] = {
VOPNAME_GETATTR, { .vop_getattr = zfs_getattr },
VOPNAME_SETATTR, { .vop_setattr = zfs_setattr },
@@ -4753,7 +4750,6 @@ const fs_operation_def_t zfs_symvnodeops
/*
* special share hidden files vnode operations template
*/
-vnodeops_t *zfs_sharevnodeops;
const fs_operation_def_t zfs_sharevnodeops_template[] = {
VOPNAME_GETATTR, { .vop_getattr = zfs_getattr },
VOPNAME_ACCESS, { .vop_access = zfs_access },
@@ -4777,7 +4773,6 @@ const fs_operation_def_t zfs_sharevnodeo
* zfs_link() - no links into/out of attribute space
* zfs_rename() - no moves into/out of attribute space
*/
-vnodeops_t *zfs_xdvnodeops;
const fs_operation_def_t zfs_xdvnodeops_template[] = {
VOPNAME_OPEN, { .vop_open = zfs_open },
VOPNAME_CLOSE, { .vop_close = zfs_close },
@@ -4808,7 +4803,6 @@ const fs_operation_def_t zfs_xdvnodeops_
/*
* Error vnode operations template
*/
-vnodeops_t *zfs_evnodeops;
const fs_operation_def_t zfs_evnodeops_template[] = {
VOPNAME_INACTIVE, { .vop_inactive = zfs_inactive },
VOPNAME_PATHCONF, { .vop_pathconf = zfs_pathconf },
Index: zfs-fuse/src/lib/libsolkerncompat/main.c
===================================================================
--- zfs-fuse.orig/src/lib/libsolkerncompat/main.c
+++ zfs-fuse/src/lib/libsolkerncompat/main.c
@@ -44,6 +44,7 @@ unsigned long _pagesize;
unsigned int _pageshift;
kmem_cache_t *vnode_cache;
extern void system_taskq_init();
+struct utsname utsname;
void libsolkerncompat_init()
{
|
