Revert "LU-8856 osd: mark specific transactions netfree"

[fs/lustre-release.git] / lustre / utils / libmount_utils_zfs.c

diff --git a/lustre/utils/libmount_utils_zfs.c b/lustre/utils/libmount_utils_zfs.c
index b616225..04b1d61 100644 (file)
--- a/lustre/utils/libmount_utils_zfs.c
+++ b/lustre/utils/libmount_utils_zfs.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -667,6 +667,7 @@ int zfs_make_lustre(struct mkfs_opts *mop)
        php = zpool_open(g_zfs, pool);
        if (php) {
                pool_exists = 1;
+               zpool_set_prop(php, "canmount", "off");
                zpool_close(php);
        }
 
@@ -701,15 +702,14 @@ int zfs_make_lustre(struct mkfs_opts *mop)
        /*
         * Set Options on ZPOOL
         *
-        * ALL   - canmount=off
+        * ALL   - canmount=off (set above)
         * 0.7.0 - multihost=on
+        * 0.7.0 - feature@userobj_accounting=enabled
         */
        php = zpool_open(g_zfs, pool);
        if (php) {
-               if (pool_exists)
-                       zpool_set_prop(php, "canmount", "off");
-
                zpool_set_prop(php, "multihost", "on");
+               zpool_set_prop(php, "feature@userobj_accounting", "enabled");
 
                zpool_close(php);
        }