Merge branch 'zpl'

diff --combined module/zfs/dmu_objset.c
index 0ff95a6,cbd1778..0703a94
--- 1/module/zfs/dmu_objset.c
--- 2/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@@ -910,10 -910,8 +910,8 @@@ dmu_objset_snapshot_one(const char *nam
         * permission checks for the starting dataset have already been
         * performed in zfs_secpolicy_snapshot()
         */
- #ifdef HAVE_ZPL
        if (sn->recursive && (err = zfs_secpolicy_snapshot_perms(name, CRED())))
                return (err);
- #endif
  
        err = dmu_objset_hold(name, sn, &os);
        if (err != 0)
@@@ -1813,7 -1811,6 +1811,7 @@@ EXPORT_SYMBOL(dmu_objset_destroy)
  EXPORT_SYMBOL(dmu_objset_snapshot);
  EXPORT_SYMBOL(dmu_objset_stats);
  EXPORT_SYMBOL(dmu_objset_fast_stat);
 +EXPORT_SYMBOL(dmu_objset_spa);
  EXPORT_SYMBOL(dmu_objset_space);
  EXPORT_SYMBOL(dmu_objset_fsid_guid);
  EXPORT_SYMBOL(dmu_objset_find);