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..148260c 100644 (file)
--- a/lustre/utils/libmount_utils_zfs.c
+++ b/lustre/utils/libmount_utils_zfs.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
  * GPL HEADER END
  */
 /*

- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.

  * Use is subject to license terms.
  */
 /*
  * Use is subject to license terms.
  */
 /*


@@ -543,6 +543,9 @@ static char *zfs_mkfs_opts(struct mkfs_opts *mop, char *str, int len)
 
        if (strlen(mop->mo_mkfsopts) != 0)
                snprintf(str, len, " -o %s", mop->mo_mkfsopts);
 
        if (strlen(mop->mo_mkfsopts) != 0)
                snprintf(str, len, " -o %s", mop->mo_mkfsopts);

+       if (mop->mo_device_kb)
+               snprintf(str, len, " -o quota=%llu",
+                        mop->mo_device_kb * 1024);

 
        return str;
 }
 
        return str;
 }


@@ -667,6 +670,7 @@ int zfs_make_lustre(struct mkfs_opts *mop)
        php = zpool_open(g_zfs, pool);
        if (php) {
                pool_exists = 1;
        php = zpool_open(g_zfs, pool);
        if (php) {
                pool_exists = 1;

+               zpool_set_prop(php, "canmount", "off");

                zpool_close(php);
        }
 
                zpool_close(php);
        }
 


@@ -701,15 +705,14 @@ int zfs_make_lustre(struct mkfs_opts *mop)
        /*
         * Set Options on ZPOOL
         *
        /*
         * Set Options on ZPOOL
         *

-        * ALL   - canmount=off
+        * ALL   - canmount=off (set above)

         * 0.7.0 - multihost=on
         * 0.7.0 - multihost=on

+        * 0.7.0 - feature@userobj_accounting=enabled

         */
        php = zpool_open(g_zfs, pool);
        if (php) {
         */
        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, "multihost", "on");

+               zpool_set_prop(php, "feature@userobj_accounting", "enabled");

 
                zpool_close(php);
        }
 
                zpool_close(php);
        }