LU-8912 nodemap: fix contiguous range support

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

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 2dcd7e4..4eb8b1d 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -3517,14 +3517,21 @@ int jt_nodemap_add_range(int argc, char **argv)
                return -1;
        }
 
-       if (!cfs_nidrange_is_contiguous(&nidlist)) {
-               fprintf(stderr, "error: %s: nodemap ranges must be "
-                       "contiguous\n", jt_cmdname(argv[0]));
-               return -1;
+       rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+                                      LNET_NIDSTR_SIZE);
+       if (rc < 0) {
+               errno = -rc;
+               if (rc == -EINVAL)
+                       fprintf(stderr, "error: %s: nid range uses "
+                               "currently unsupported features\n",
+                               jt_cmdname(argv[0]));
+               else if (rc == -ERANGE)
+                       fprintf(stderr, "error: %s: nodemap ranges must be "
+                               "contiguous\n", jt_cmdname(argv[0]));
+
+               return rc;
        }
 
-       cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
-                                 LNET_NIDSTR_SIZE);
        snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
 
        rc = nodemap_cmd(LCFG_NODEMAP_ADD_RANGE, NULL, 0, argv[0],
@@ -3593,14 +3600,21 @@ int jt_nodemap_del_range(int argc, char **argv)
                return -1;
        }
 
-       if (!cfs_nidrange_is_contiguous(&nidlist)) {
-               fprintf(stderr, "error: %s: nodemap ranges must be "
-                       "contiguous\n", jt_cmdname(argv[0]));
-               return -1;
+       rc = cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
+                                      LNET_NIDSTR_SIZE);
+       if (rc < 0) {
+               errno = -rc;
+               if (rc == -EINVAL)
+                       fprintf(stderr, "error: %s: nid range uses "
+                               "currently unsupported features\n",
+                               jt_cmdname(argv[0]));
+               else if (rc == -ERANGE)
+                       fprintf(stderr, "error: %s: nodemap ranges must be "
+                               "contiguous\n", jt_cmdname(argv[0]));
+
+               return rc;
        }
 
-       cfs_nidrange_find_min_max(&nidlist, &min_nid[0], &max_nid[0],
-                                 LNET_NIDSTR_SIZE);
        snprintf(nid_range, sizeof(nid_range), "%s:%s", min_nid, max_nid);
 
        rc = nodemap_cmd(LCFG_NODEMAP_DEL_RANGE, NULL, 0, argv[0],