From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 18 Feb 2011 17:31:25 +0000 (-0800)
Subject: Merge branch 'zpl'
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=5d0265c0dd54d798a35babe587ad5138392fe807;hp=-c;p=zfs.git

Merge branch 'zpl'
---

5d0265c0dd54d798a35babe587ad5138392fe807
diff --combined module/zfs/dmu_objset.c
index 0ff95a6,cbd1778..0703a94
--- a/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);