LU-16518 rsync: fix new clang error in lustre_rsync.c

[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 770a053..7f63cda 100644 (file)
--- a/lustre/utils/libmount_utils_zfs.c
+++ b/lustre/utils/libmount_utils_zfs.c
@@ -168,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,56 +274,11 @@ static int zfs_set_prop_params(zfs_handle_t *zhp, char *params)
 static int zfs_check_hostid(struct mkfs_opts *mop)
 {
        unsigned long hostid;
-#ifndef HAVE_ZFS_MULTIHOST
-       FILE *f;
-       int rc;
-#endif
 
        if (strstr(mop->mo_ldd.ldd_params, PARAM_FAILNODE) == NULL)
                return 0;
 
-#ifdef HAVE_ZFS_MULTIHOST
        hostid = get_system_hostid();
-#else
-       /* This reimplements libzfs2::get_system_hostid() from 0.7+ because
-        * prior to 0.7.0 (MULTIHOST support), get_system_hostid() would return
-        * gethostid() if spl_hostid was 0, which would generate a hostid if
-        * /etc/hostid wasn't set, which is incompatible with the kernel
-        * implementation.
-        */
-       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(HW_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 "HW_HOSTID_PATH": %d\n",
-                      rc);
-               hostid = 0;
-       }
-
-out:
-#endif
        if (hostid == 0) {
                if (mop->mo_flags & MO_NOHOSTID_CHECK) {
                        fprintf(stderr, "WARNING: spl_hostid not set. ZFS has "
@@ -337,8 +329,13 @@ int zfs_write_ldd(struct mkfs_opts *mop)
 
        vprint("Writing %s properties\n", ds);
 
-       if (mop->mo_flags & MO_ERASE_ALL)
+       if (mop->mo_flags & MO_ERASE_ALL) {
                ret = zfs_erase_allprops(zhp);
+               if (ret < 0) {
+                       fprintf(stderr, "zfs_erase_allprops Failed: %d\n", ret);
+                       goto out_close;
+               }
+       }
        ret = zfs_set_prop_params(zhp, ldd->ldd_params);
 
        for (i = 0; special_ldd_prop_params[i].zlpb_prop_name != NULL; i++) {
@@ -410,17 +407,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;
@@ -489,7 +475,6 @@ int zfs_read_ldd(char *ds,  struct lustre_disk_data *ldd)
        ldd->ldd_mount_type = LDD_MT_ZFS;
        ret = 0;
 
-#ifdef HAVE_ZFS_MULTIHOST
        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,
@@ -499,7 +484,6 @@ int zfs_read_ldd(char *ds,  struct lustre_disk_data *ldd)
                                "but zpool does not have multihost enabled\n",
                                progname, ds);
        }
-#endif
 
 out_close:
        zfs_close(zhp);
@@ -570,7 +554,7 @@ static char *zfs_mkfs_opts(struct mkfs_opts *mop, char *str, int len)
                snprintf(str, len, " -o %s", mop->mo_mkfsopts);
        if (mop->mo_device_kb)
                snprintf(str, len, " -o quota=%llu",
-                        mop->mo_device_kb * 1024);
+                        (unsigned long long)mop->mo_device_kb * 1024);
 
        return str;
 }
@@ -734,18 +718,12 @@ int zfs_make_lustre(struct mkfs_opts *mop)
         * 0.7.0 - multihost=on
         * 0.7.0 - feature@userobj_accounting=enabled
         */
-#if defined(HAVE_ZFS_MULTIHOST) || defined(HAVE_DMU_USEROBJ_ACCOUNTING)
        php = zpool_open(g_zfs, pool);
        if (php) {
-#ifdef HAVE_ZFS_MULTIHOST
                zpool_set_prop(php, "multihost", "on");
-#endif
-#ifdef HAVE_DMU_USEROBJ_ACCOUNTING
                zpool_set_prop(php, "feature@userobj_accounting", "enabled");
-#endif
                zpool_close(php);
        }
-#endif
 
        /*
         * Create the ZFS filesystem with any required mkfs options: