diff options
| author | Brian Behlendorf <[email protected]> | 2011-02-18 09:31:25 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-02-18 09:31:25 -0800 |
| commit | 5d0265c0dd54d798a35babe587ad5138392fe807 (patch) | |
| tree | a1b69d12acfb76418c7fd3889b525dea0744a099 /module/zfs/dmu_objset.c | |
| parent | 54a179e7b80413bd48cd2cd259110fb493d0215e (diff) | |
| parent | 037849f854c511d86e3564ed7000e6c6472d6f70 (diff) | |
Merge branch 'zpl'
Diffstat (limited to 'module/zfs/dmu_objset.c')
| -rw-r--r-- | module/zfs/dmu_objset.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index 0ff95a64e..0703a9466 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -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) |