git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove inconsistent use of EOPNOTSUPP
[zfs.git]
/
module
/
zfs
/
zfs_vfsops.c
diff --git
a/module/zfs/zfs_vfsops.c
b/module/zfs/zfs_vfsops.c
index
cb8c1d0
..
77bef00
100644
(file)
--- a/
module/zfs/zfs_vfsops.c
+++ b/
module/zfs/zfs_vfsops.c
@@
-65,6
+65,7
@@
#include <sys/sa.h>
#include "zfs_comutil.h"
#include <sys/sa.h>
#include "zfs_comutil.h"
+#ifdef HAVE_ZPL
int zfsfstype;
vfsops_t *zfs_vfsops = NULL;
static major_t zfs_major;
int zfsfstype;
vfsops_t *zfs_vfsops = NULL;
static major_t zfs_major;
@@
-560,6
+561,7
@@
unregister:
return (error);
}
return (error);
}
+#endif /* HAVE_ZPL */
static int
zfs_space_delta_cb(dmu_object_type_t bonustype, void *data,
static int
zfs_space_delta_cb(dmu_object_type_t bonustype, void *data,
@@
-610,6
+612,7
@@
zfs_space_delta_cb(dmu_object_type_t bonustype, void *data,
return (error);
}
return (error);
}
+#ifdef HAVE_ZPL
static void
fuidstr_to_sid(zfsvfs_t *zfsvfs, const char *fuidstr,
char *domainbuf, int buflen, uid_t *ridp)
static void
fuidstr_to_sid(zfsvfs_t *zfsvfs, const char *fuidstr,
char *domainbuf, int buflen, uid_t *ridp)
@@
-2127,10
+2130,12
@@
zfs_vfsinit(int fstype, char *name)
return (0);
}
return (0);
}
+#endif /* HAVE_ZPL */
void
zfs_init(void)
{
void
zfs_init(void)
{
+#ifdef HAVE_ZPL
/*
* Initialize .zfs directory structures
*/
/*
* Initialize .zfs directory structures
*/
@@
-2140,6
+2145,7
@@
zfs_init(void)
* Initialize znode cache, vnode ops, etc...
*/
zfs_znode_init();
* Initialize znode cache, vnode ops, etc...
*/
zfs_znode_init();
+#endif /* HAVE_ZPL */
dmu_objset_register_type(DMU_OST_ZFS, zfs_space_delta_cb);
}
dmu_objset_register_type(DMU_OST_ZFS, zfs_space_delta_cb);
}
@@
-2147,16
+2153,13
@@
zfs_init(void)
void
zfs_fini(void)
{
void
zfs_fini(void)
{
+#ifdef HAVE_ZPL
zfsctl_fini();
zfs_znode_fini();
zfsctl_fini();
zfs_znode_fini();
+#endif /* HAVE_ZPL */
}
}
-int
-zfs_busy(void)
-{
- return (zfs_active_fs_count != 0);
-}
-
+#ifdef HAVE_ZPL
int
zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
{
int
zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
{
@@
-2224,6
+2227,7
@@
zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
return (0);
}
return (0);
}
+#endif /* HAVE_ZPL */
/*
* Read a property stored within the master node.
/*
* Read a property stored within the master node.
@@
-2267,6
+2271,7
@@
zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value)
return (error);
}
return (error);
}
+#ifdef HAVE_ZPL
static vfsdef_t vfw = {
VFSDEF_VERSION,
MNTTYPE_ZFS,
static vfsdef_t vfw = {
VFSDEF_VERSION,
MNTTYPE_ZFS,
@@
-2279,3
+2284,4
@@
static vfsdef_t vfw = {
struct modlfs zfs_modlfs = {
&mod_fsops, "ZFS filesystem version " SPA_VERSION_STRING, &vfw
};
struct modlfs zfs_modlfs = {
&mod_fsops, "ZFS filesystem version " SPA_VERSION_STRING, &vfw
};
+#endif /* HAVE_ZPL */