Export symbol dmu_objset_userobjspace_upgradable

It's used by Lustre to determine if the objset can be upgraded.
The inline version doesn't work because dmu_objset_is_snapshot()
is not exported.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Closes #5385

diff --git a/include/sys/dmu_objset.h b/include/sys/dmu_objset.h
index 2ec1ec87d87f42e1dc8421ab0a312d139fc96275..ed3cbf4989090b377243b8f9c0a10107c6001bbf 100644 (file)
--- a/include/sys/dmu_objset.h
+++ b/include/sys/dmu_objset.h
@@ -184,17 +184,10 @@ boolean_t dmu_objset_userused_enabled(objset_t *os);
 int dmu_objset_userspace_upgrade(objset_t *os);
 boolean_t dmu_objset_userspace_present(objset_t *os);
 boolean_t dmu_objset_userobjused_enabled(objset_t *os);
+boolean_t dmu_objset_userobjspace_upgradable(objset_t *os);
 void dmu_objset_userobjspace_upgrade(objset_t *os);
 boolean_t dmu_objset_userobjspace_present(objset_t *os);
 
-static inline boolean_t dmu_objset_userobjspace_upgradable(objset_t *os)
-{
-       return (dmu_objset_type(os) == DMU_OST_ZFS &&
-           !dmu_objset_is_snapshot(os) &&
-           dmu_objset_userobjused_enabled(os) &&
-           !dmu_objset_userobjspace_present(os));
-}
-
 int dmu_fsname(const char *snapname, char *buf);
 
 void dmu_objset_evict_done(objset_t *os);

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index c1f2d8430d2ffc9062a8b82fe8ff97457df131cb..65aff9550877dae5e40681aba31a21069c9a8fee 100644 (file)
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -1771,6 +1771,15 @@ dmu_objset_userobjspace_upgrade(objset_t *os)
        dmu_objset_upgrade(os, dmu_objset_userobjspace_upgrade_cb);
 }
 
+boolean_t
+dmu_objset_userobjspace_upgradable(objset_t *os)
+{
+       return (dmu_objset_type(os) == DMU_OST_ZFS &&
+           !dmu_objset_is_snapshot(os) &&
+           dmu_objset_userobjused_enabled(os) &&
+           !dmu_objset_userobjspace_present(os));
+}
+
 void
 dmu_objset_space(objset_t *os, uint64_t *refdbytesp, uint64_t *availbytesp,
     uint64_t *usedobjsp, uint64_t *availobjsp)
@@ -2334,5 +2343,6 @@ EXPORT_SYMBOL(dmu_objset_userspace_upgrade);
 EXPORT_SYMBOL(dmu_objset_userspace_present);
 EXPORT_SYMBOL(dmu_objset_userobjused_enabled);
 EXPORT_SYMBOL(dmu_objset_userobjspace_upgrade);
+EXPORT_SYMBOL(dmu_objset_userobjspace_upgradable);
 EXPORT_SYMBOL(dmu_objset_userobjspace_present);
 #endif