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 zfs_ctldir.[ch]
[zfs.git]
/
module
/
zfs
/
zfs_vfsops.c
diff --git
a/module/zfs/zfs_vfsops.c
b/module/zfs/zfs_vfsops.c
index
c138b6f
..
7c980b1
100644
(file)
--- a/
module/zfs/zfs_vfsops.c
+++ b/
module/zfs/zfs_vfsops.c
@@
-55,7
+55,6
@@
#include <sys/modctl.h>
#include <sys/refstr.h>
#include <sys/zfs_ioctl.h>
#include <sys/modctl.h>
#include <sys/refstr.h>
#include <sys/zfs_ioctl.h>
-#include <sys/zfs_ctldir.h>
#include <sys/zfs_fuid.h>
#include <sys/bootconf.h>
#include <sys/sunddi.h>
#include <sys/zfs_fuid.h>
#include <sys/bootconf.h>
#include <sys/sunddi.h>
@@
-66,7
+65,6
@@
#include "zfs_comutil.h"
#ifdef HAVE_ZPL
#include "zfs_comutil.h"
#ifdef HAVE_ZPL
-extern int sys_shutdown;
/*ARGSUSED*/
int
/*ARGSUSED*/
int
@@
-76,7
+74,7
@@
zfs_sync(vfs_t *vfsp, short flag, cred_t *cr)
* Data integrity is job one. We don't want a compromised kernel
* writing to the storage pool, so we never sync during panic.
*/
* Data integrity is job one. We don't want a compromised kernel
* writing to the storage pool, so we never sync during panic.
*/
- if (
panicstr
)
+ if (
unlikely(oops_in_progress)
)
return (0);
if (vfsp != NULL) {
return (0);
if (vfsp != NULL) {
@@
-89,14
+87,19
@@
zfs_sync(vfs_t *vfsp, short flag, cred_t *cr)
ZFS_ENTER(zfsvfs);
dp = dmu_objset_pool(zfsvfs->z_os);
ZFS_ENTER(zfsvfs);
dp = dmu_objset_pool(zfsvfs->z_os);
+#ifdef HAVE_SHUTDOWN
/*
* If the system is shutting down, then skip any
* filesystems which may exist on a suspended pool.
/*
* If the system is shutting down, then skip any
* filesystems which may exist on a suspended pool.
+ *
+ * XXX: This can be implemented using the Linux reboot
+ * notifiers: {un}register_reboot_notifier().
*/
if (sys_shutdown && spa_suspended(dp->dp_spa)) {
ZFS_EXIT(zfsvfs);
return (0);
}
*/
if (sys_shutdown && spa_suspended(dp->dp_spa)) {
ZFS_EXIT(zfsvfs);
return (0);
}
+#endif /* HAVE_SHUTDOWN */
if (zfsvfs->z_log != NULL)
zil_commit(zfsvfs->z_log, 0);
if (zfsvfs->z_log != NULL)
zil_commit(zfsvfs->z_log, 0);
@@
-974,6
+977,7
@@
zfsvfs_free(zfsvfs_t *zfsvfs)
kmem_free(zfsvfs, sizeof (zfsvfs_t));
}
kmem_free(zfsvfs, sizeof (zfsvfs_t));
}
+#ifdef HAVE_FUID_FEATURES
static void
zfs_set_fuid_feature(zfsvfs_t *zfsvfs)
{
static void
zfs_set_fuid_feature(zfsvfs_t *zfsvfs)
{
@@
-988,6
+992,7
@@
zfs_set_fuid_feature(zfsvfs_t *zfsvfs)
}
zfsvfs->z_use_sa = USE_SA(zfsvfs->z_version, zfsvfs->z_os);
}
}
zfsvfs->z_use_sa = USE_SA(zfsvfs->z_version, zfsvfs->z_os);
}
+#endif /* HAVE_FUID_FEATURES */
int
zfs_domount(vfs_t *vfsp, char *osname)
int
zfs_domount(vfs_t *vfsp, char *osname)
@@
-1029,6
+1034,7
@@
zfs_domount(vfs_t *vfsp, char *osname)
vfsp->vfs_fsid.val[0] = fsid_guid;
vfsp->vfs_fsid.val[1] = ((fsid_guid>>32) << 8);
vfsp->vfs_fsid.val[0] = fsid_guid;
vfsp->vfs_fsid.val[1] = ((fsid_guid>>32) << 8);
+#ifdef HAVE_FUID_FEATURES
/*
* Set features for file system.
*/
/*
* Set features for file system.
*/
@@
-1042,6
+1048,7
@@
zfs_domount(vfs_t *vfsp, char *osname)
vfs_set_feature(vfsp, VFSFT_CASEINSENSITIVE);
}
vfs_set_feature(vfsp, VFSFT_ZEROCOPY_SUPPORTED);
vfs_set_feature(vfsp, VFSFT_CASEINSENSITIVE);
}
vfs_set_feature(vfsp, VFSFT_ZEROCOPY_SUPPORTED);
+#endif /* HAVE_FUID_FEATURES */
if (dmu_objset_is_snapshot(zfsvfs->z_os)) {
uint64_t pval;
if (dmu_objset_is_snapshot(zfsvfs->z_os)) {
uint64_t pval;
@@
-1673,8
+1680,10
@@
zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
zfsvfs->z_version = newvers;
zfsvfs->z_version = newvers;
+#ifdef HAVE_FUID_FEATURES
if (zfsvfs->z_version >= ZPL_VERSION_FUID)
zfs_set_fuid_feature(zfsvfs);
if (zfsvfs->z_version >= ZPL_VERSION_FUID)
zfs_set_fuid_feature(zfsvfs);
+#endif /* HAVE_FUID_FEATURES */
return (0);
}
return (0);
}