Print this page
3699 zfs hold or release of a non-existent snapshot does not output error
3739 cannot set zfs quota or reservation on pool version < 22
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Eric Shrock <eric.schrock@delphix.com>

@@ -19,10 +19,11 @@
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Martin Matuska. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
 #include <sys/dmu.h>
 #include <sys/dmu_objset.h>

@@ -555,14 +556,10 @@
         } else {
                 zapobj = ds->ds_dir->dd_phys->dd_props_zapobj;
         }
 
         if (version < SPA_VERSION_RECVD_PROPS) {
-                zfs_prop_t prop = zfs_name_to_prop(propname);
-                if (prop == ZFS_PROP_QUOTA || prop == ZFS_PROP_RESERVATION)
-                        return;
-
                 if (source & ZPROP_SRC_NONE)
                         source = ZPROP_SRC_NONE;
                 else if (source & ZPROP_SRC_RECEIVED)
                         source = ZPROP_SRC_LOCAL;
         }