LU-16605 lfs: Add -n option to fid2path

[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 f77ea7e..2fdc0b6 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.
  */
 /*
@@ -31,8 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <libzfs.h>
-
-#define HOSTID_PATH "/etc/hostid"
+#include <sys/systeminfo.h>
 
 /* Persistent mount data is stored in these user attributes */
 #define LDD_PREFIX             "lustre:"
@@ -169,24 +168,61 @@ static int zfs_erase_prop(zfs_handle_t *zhp, char *param)
        return zfs_remove_prop(zhp, nvl, propname);
 }
 
+static int zfs_is_special_ldd_prop_param(char *name)
+{
+       int i;
+
+       for (i = 0; special_ldd_prop_params[i].zlpb_prop_name != NULL; i++)
+               if (!strcmp(name, special_ldd_prop_params[i].zlpb_prop_name))
+                       return 1;
+
+       return 0;
+}
+
 static int zfs_erase_allprops(zfs_handle_t *zhp)
 {
-       nvlist_t *nvl;
-       nvpair_t *curr = NULL;
+       nvlist_t *props;
+       nvpair_t *nvp;
+       size_t str_size = 1024 * 1024;
+       char *strs, *cur;
+       int rc = 0;
 
-       nvl = zfs_get_user_props(zhp);
-       if (!nvl)
+       strs = malloc(str_size);
+       if (!strs)
+               return ENOMEM;
+       cur = strs;
+
+       props = zfs_get_user_props(zhp);
+       if (props == NULL) {
+               free(strs);
                return ENOENT;
+       }
+       nvp = NULL;
+       while (nvp = nvlist_next_nvpair(props, nvp), nvp) {
+               if (strncmp(nvpair_name(nvp), LDD_PREFIX, strlen(LDD_PREFIX)))
+                       continue;
 
-       curr = nvlist_next_nvpair(nvl, curr);
-       while (curr) {
-               nvpair_t *next = nvlist_next_nvpair(nvl, curr);
+               if (zfs_is_special_ldd_prop_param(nvpair_name(nvp)))
+                       continue;
 
-               zfs_remove_prop(zhp, nvl, nvpair_name(curr));
-               curr = next;
+               rc = snprintf(cur, str_size - (cur - strs), "%s",
+                             nvpair_name(nvp));
+               if (rc != strlen(nvpair_name(nvp))) {
+                       fprintf(stderr, "%s: zfs has too many properties to erase, please repeat\n",
+                               progname);
+                       rc = EINVAL;
+                       break;
+               }
+               cur += strlen(cur) + 1;
+       }
+       cur = strs;
+       while ( cur < (strs + str_size) && strlen(cur) > 0) {
+               zfs_prop_inherit(zhp, cur, false);
+               cur += strlen(cur) + 1;
        }
 
-       return 0;
+       free(strs);
+       return rc;
 }
 
 /*
@@ -237,45 +273,12 @@ static int zfs_set_prop_params(zfs_handle_t *zhp, char *params)
 
 static int zfs_check_hostid(struct mkfs_opts *mop)
 {
-       FILE *f;
        unsigned long hostid;
-       int rc;
 
        if (strstr(mop->mo_ldd.ldd_params, PARAM_FAILNODE) == NULL)
                return 0;
 
-       f = fopen("/sys/module/spl/parameters/spl_hostid", "r");
-       if (f == NULL) {
-               fatal();
-               fprintf(stderr, "Failed to open spl_hostid: %s\n",
-                       strerror(errno));
-               return errno;
-       }
-       rc = fscanf(f, "%li", &hostid);
-       fclose(f);
-       if (rc != 1) {
-               fatal();
-               fprintf(stderr, "Failed to read spl_hostid: %d\n", rc);
-               return rc;
-       }
-
-       if (hostid != 0)
-               return 0;
-
-       f = fopen(HOSTID_PATH, "r");
-       if (f == NULL)
-               goto out;
-
-       rc = fread(&hostid, sizeof(uint32_t), 1, f);
-       fclose(f);
-
-       if (rc != 1) {
-               fprintf(stderr, "Failed to read "HOSTID_PATH": %d\n",
-                      rc);
-               hostid = 0;
-       }
-
-out:
+       hostid = get_system_hostid();
        if (hostid == 0) {
                if (mop->mo_flags & MO_NOHOSTID_CHECK) {
                        fprintf(stderr, "WARNING: spl_hostid not set. ZFS has "
@@ -399,17 +402,6 @@ static int zfs_get_prop_str(zfs_handle_t *zhp, char *prop, void *val)
        return ret;
 }
 
-static int zfs_is_special_ldd_prop_param(char *name)
-{
-       int i;
-
-       for (i = 0; special_ldd_prop_params[i].zlpb_prop_name != NULL; i++)
-               if (!strcmp(name, special_ldd_prop_params[i].zlpb_prop_name))
-                       return 1;
-
-       return 0;
-}
-
 static int zfs_get_prop_params(zfs_handle_t *zhp, char *param)
 {
        nvlist_t *props;
@@ -477,8 +469,20 @@ int zfs_read_ldd(char *ds,  struct lustre_disk_data *ldd)
 
        ldd->ldd_mount_type = LDD_MT_ZFS;
        ret = 0;
+
+       if (strstr(ldd->ldd_params, PARAM_FAILNODE) != NULL) {
+               zpool_handle_t *pool = zfs_get_pool_handle(zhp);
+               uint64_t mh = zpool_get_prop_int(pool, ZPOOL_PROP_MULTIHOST,
+                                                NULL);
+               if (!mh)
+                       fprintf(stderr, "%s: %s is configured for failover "
+                               "but zpool does not have multihost enabled\n",
+                               progname, ds);
+       }
+
 out_close:
        zfs_close(zhp);
+
 out:
        return ret;
 }
@@ -543,6 +547,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",
+                        (unsigned long long)mop->mo_device_kb * 1024);
 
        return str;
 }
@@ -710,7 +717,6 @@ int zfs_make_lustre(struct mkfs_opts *mop)
        if (php) {
                zpool_set_prop(php, "multihost", "on");
                zpool_set_prop(php, "feature@userobj_accounting", "enabled");
-
                zpool_close(php);
        }