LU-13559 utils: fix lfs mirror delete error message

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

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 8b512ca..1753019 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -1992,6 +1992,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
        char *ptr;
        struct ll_ioc_lease *data;
        uint16_t mirror_count;
+       __u32 mirror_id;
        int mdt_index;
        int fd, fdv;
        int rc;
@@ -2030,22 +2031,35 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
 
                rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool,
                                               &data);
-               id = data.id;
+               mirror_id = data.id;
        } else if (mflags & MF_COMP_ID) {
                rc = llapi_layout_comp_iterate(layout, find_comp_id, &id);
-               id = mirror_id_of(id);
+               mirror_id = mirror_id_of(id);
        } else {
                rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id);
+               mirror_id = id;
        }
        if (rc < 0) {
                fprintf(stderr, "error %s: failed to iterate layout of '%s'\n",
                        progname, fname);
                goto free_layout;
        } else if (rc == LLAPI_LAYOUT_ITER_CONT) {
-               fprintf(stderr,
-                    "error %s: file '%s' does not contain mirror with id %u\n",
-                       progname, fname, id);
-               goto free_layout;
+               if (mflags & MF_COMP_POOL) {
+                       fprintf(stderr,
+                               "error %s: file '%s' does not contain mirror with pool '%s'\n",
+                               progname, fname, pool);
+                       goto free_layout;
+               } else if (mflags & MF_COMP_ID) {
+                       fprintf(stderr,
+                               "error %s: file '%s' does not contain mirror with comp-id %u\n",
+                               progname, fname, id);
+                       goto free_layout;
+               } else {
+                       fprintf(stderr,
+                               "error %s: file '%s' does not contain mirror with id %u\n",
+                               progname, fname, id);
+                       goto free_layout;
+               }
        }
 
        fd = open(fname, O_RDWR);
@@ -2088,7 +2102,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
        if (victim_file == NULL) {
                /* use a temp file to store the splitted layout */
                if (mflags & MF_DESTROY) {
-                       if (last_non_stale_mirror(id, layout)) {
+                       if (last_non_stale_mirror(mirror_id, layout)) {
                                rc = -EUCLEAN;
                                fprintf(stderr,
                                        "%s: cannot destroy the last non-stale mirror of file '%s'\n",
@@ -2100,7 +2114,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
                                                        O_LOV_DELAY_CREATE);
                } else {
                        snprintf(victim, sizeof(victim), "%s.mirror~%u",
-                                fname, id);
+                                fname, mirror_id);
                        fdv = open(victim, flags, S_IRUSR | S_IWUSR);
                }
        } else {
@@ -2135,7 +2149,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
        data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
        data->lil_count = 2;
        data->lil_ids[0] = fdv;
-       data->lil_ids[1] = id;
+       data->lil_ids[1] = mirror_id;
        rc = llapi_lease_set(fd, data);
        if (rc <= 0) {
                if (rc == 0) /* lost lease lock */
@@ -5644,15 +5658,15 @@ static struct obd_statfs_state_names {
        const char              osn_name;
        bool                    osn_err;
 } oss_names[] = {
-       { .osn_state = OS_STATE_DEGRADED,    .osn_name = 'D', .osn_err = true },
-       { .osn_state = OS_STATE_READONLY,    .osn_name = 'R', .osn_err = true },
-       { .osn_state = OS_STATE_NOPRECREATE, .osn_name = 'N', .osn_err = true },
-       { .osn_state = OS_STATE_UNUSED1,     .osn_name = '?', .osn_err = true },
-       { .osn_state = OS_STATE_UNUSED2,     .osn_name = '?', .osn_err = true },
-       { .osn_state = OS_STATE_ENOSPC,      .osn_name = 'S', .osn_err = true },
-       { .osn_state = OS_STATE_ENOINO,      .osn_name = 'I', .osn_err = true },
-       { .osn_state = OS_STATE_SUM,         .osn_name = 'a', /* aggregate */ },
-       { .osn_state = OS_STATE_NONROT,      .osn_name = 'f', /* flash */     },
+       { .osn_state = OS_STATFS_DEGRADED,   .osn_name = 'D', .osn_err = true },
+       { .osn_state = OS_STATFS_READONLY,   .osn_name = 'R', .osn_err = true },
+       { .osn_state = OS_STATFS_NOPRECREATE,.osn_name = 'N', .osn_err = true },
+       { .osn_state = OS_STATFS_UNUSED1,    .osn_name = '?', .osn_err = true },
+       { .osn_state = OS_STATFS_UNUSED2,    .osn_name = '?', .osn_err = true },
+       { .osn_state = OS_STATFS_ENOSPC,     .osn_name = 'S', .osn_err = true },
+       { .osn_state = OS_STATFS_ENOINO,     .osn_name = 'I', .osn_err = true },
+       { .osn_state = OS_STATFS_SUM,        .osn_name = 'a', /* aggregate */ },
+       { .osn_state = OS_STATFS_NONROT,     .osn_name = 'f', /* flash */     },
 };
 
 static int showdf(char *mntdir, struct obd_statfs *stat,