Merge branch 'zpl'

This commit is contained in:
Brian Behlendorf
2011-02-18 09:31:25 -08:00
128 changed files with 7825 additions and 6888 deletions
-2
View File
@@ -910,10 +910,8 @@ dmu_objset_snapshot_one(const char *name, void *arg)
* 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)