diff options
| -rw-r--r-- | cmd/ztest/ztest.c | 2 | ||||
| -rw-r--r-- | include/sys/zfs_vfsops.h | 4 | ||||
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 14 |
3 files changed, 15 insertions, 5 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 715815859..72d511b06 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -2123,7 +2123,7 @@ ztest_zil_remount(ztest_ds_t *zd, uint64_t id) (void) rw_enter(&zd->zd_zilog_lock, RW_WRITER); - /* zfsvfs_teardown() */ + /* zfs_sb_teardown() */ zil_close(zd->zd_zilog); /* zfsvfs_setup() */ diff --git a/include/sys/zfs_vfsops.h b/include/sys/zfs_vfsops.h index c8861f6e2..fc8be58bc 100644 --- a/include/sys/zfs_vfsops.h +++ b/include/sys/zfs_vfsops.h @@ -179,8 +179,12 @@ extern boolean_t zfs_owner_overquota(zfs_sb_t *zsb, struct znode *, extern boolean_t zfs_fuid_overquota(zfs_sb_t *zsb, boolean_t isgroup, uint64_t fuid); extern int zfs_set_version(zfs_sb_t *zsb, uint64_t newvers); +extern int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, + uint64_t *value); extern int zfs_sb_create(const char *name, zfs_sb_t **zsbp); +extern int zfs_sb_setup(zfs_sb_t *zsb, boolean_t mounting); extern void zfs_sb_free(zfs_sb_t *zsb); +extern int zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting); extern int zfs_check_global_label(const char *dsname, const char *hexsl); extern boolean_t zfs_is_readonly(zfs_sb_t *zsb); diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 0ee541358..b115dcd66 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -715,8 +715,9 @@ out: kmem_free(zsb, sizeof (zfs_sb_t)); return (error); } +EXPORT_SYMBOL(zfs_sb_create); -static int +int zfs_sb_setup(zfs_sb_t *zsb, boolean_t mounting) { int error; @@ -797,6 +798,7 @@ zfs_sb_setup(zfs_sb_t *zsb, boolean_t mounting) return (0); } +EXPORT_SYMBOL(zfs_sb_setup); void zfs_sb_free(zfs_sb_t *zsb) @@ -816,6 +818,7 @@ zfs_sb_free(zfs_sb_t *zsb) mutex_destroy(&zsb->z_hold_mtx[i]); kmem_free(zsb, sizeof (zfs_sb_t)); } +EXPORT_SYMBOL(zfs_sb_free); static void zfs_set_fuid_feature(zfs_sb_t *zsb) @@ -899,6 +902,7 @@ zfs_check_global_label(const char *dsname, const char *hexsl) } return (EACCES); } +EXPORT_SYMBOL(zfs_check_global_label); #endif /* HAVE_MLSLABEL */ int @@ -986,7 +990,7 @@ EXPORT_SYMBOL(zfs_root); * and 'z_teardown_inactive_lock' held. */ int -zfsvfs_teardown(zfs_sb_t *zsb, boolean_t unmounting) +zfs_sb_teardown(zfs_sb_t *zsb, boolean_t unmounting) { znode_t *zp; @@ -1083,6 +1087,7 @@ zfsvfs_teardown(zfs_sb_t *zsb, boolean_t unmounting) return (0); } +EXPORT_SYMBOL(zfs_sb_teardown); #ifdef HAVE_BDI static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0); @@ -1185,7 +1190,7 @@ zfs_umount(struct super_block *sb) zfs_sb_t *zsb = sb->s_fs_info; objset_t *os; - VERIFY(zfsvfs_teardown(zsb, B_TRUE) == 0); + VERIFY(zfs_sb_teardown(zsb, B_TRUE) == 0); os = zsb->z_os; if (bdi_get_sb(sb)) { @@ -1332,7 +1337,7 @@ zfs_suspend_fs(zfs_sb_t *zsb) { int error; - if ((error = zfsvfs_teardown(zsb, B_FALSE)) != 0) + if ((error = zfs_sb_teardown(zsb, B_FALSE)) != 0) return (error); dmu_objset_disown(zsb->z_os, zsb); @@ -1512,6 +1517,7 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value) } return (error); } +EXPORT_SYMBOL(zfs_get_zplprop); void zfs_init(void) |