X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flibmount_utils_zfs.c;h=148260c6c5784c5a1e1789ccae59be5c540b64be;hp=b616225e6a331af1b766faeb559636e663d8a170;hb=8d1639b5cf1edbc885876956dcd6189173c00955;hpb=1617b8f6b6cdd0f5b74d7bfb8166d74b63cfed81

diff --git a/lustre/utils/libmount_utils_zfs.c b/lustre/utils/libmount_utils_zfs.c
index b616225..148260c 100644
--- 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.
  */
 /*
@@ -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 (mop->mo_device_kb)
+		snprintf(str, len, " -o quota=%llu",
+			 mop->mo_device_kb * 1024);
 
 	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;
+		zpool_set_prop(php, "canmount", "off");
 		zpool_close(php);
 	}
 
@@ -701,15 +705,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);
 	}