LU-9897 build: use pkgconf for detecting libblkid

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

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index 05036af..a0c8a77 100644 (file)
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -87,8 +87,9 @@ struct options {
        int                      o_shadow_tree;
        int                      o_verbose;
        int                      o_copy_xattrs;
-       int                      o_archive_cnt;
-       int                      o_archive_id[LL_HSM_MAX_ARCHIVE + 1];
+       int                      o_archive_id_used;
+       int                      o_archive_id_cnt;
+       int                     *o_archive_id;
        int                      o_report_int;
        unsigned long long       o_bandwidth;
        size_t                   o_chunk_size;
@@ -250,11 +251,20 @@ static int ct_parseopts(int argc, char * const *argv)
                                                .has_arg = required_argument },
        { .val = 'v',   .name = "verbose",      .has_arg = no_argument },
        { .name = NULL } };
-       int                      c, rc;
-       unsigned long long       value;
-       unsigned long long       unit;
+       unsigned long long value;
+       unsigned long long unit;
+       bool all_id = false;
+       int c, rc;
+       int i;
 
        optind = 0;
+
+       opt.o_archive_id_cnt = LL_HSM_ORIGIN_MAX_ARCHIVE;
+       opt.o_archive_id = malloc(opt.o_archive_id_cnt *
+                                 sizeof(*opt.o_archive_id));
+       if (opt.o_archive_id == NULL)
+               return -ENOMEM;
+repeat:
        while ((c = getopt_long(argc, argv, "A:b:c:f:hiMp:qru:v",
                                long_opts, NULL)) != -1) {
                switch (c) {
@@ -268,16 +278,41 @@ static int ct_parseopts(int argc, char * const *argv)
                                         optarg);
                                return rc;
                        }
+                       /* if archiveID is zero, any archiveID is accepted */
+                       if (all_id == true)
+                               goto repeat;
+
+                       if (val == 0) {
+                               free(opt.o_archive_id);
+                               opt.o_archive_id = NULL;
+                               opt.o_archive_id_cnt = 0;
+                               opt.o_archive_id_used = 0;
+                               all_id = true;
+                               CT_WARN("archive-id = 0 is found, any backend"
+                                       "will be served\n");
+                               goto repeat;
+                       }
 
-                       if (opt.o_archive_cnt > LL_HSM_MAX_ARCHIVE ||
-                           val > LL_HSM_MAX_ARCHIVE) {
-                               rc = -EINVAL;
-                               CT_ERROR(rc, "archive number must be less"
-                                        " than %zu", LL_HSM_MAX_ARCHIVE + 1);
-                               return rc;
+                       /* skip the duplicated id */
+                       for (i = 0; i < opt.o_archive_id_used; i++) {
+                               if (opt.o_archive_id[i] == val)
+                                       goto repeat;
+                       }
+                       /* extend the space */
+                       if (opt.o_archive_id_used >= opt.o_archive_id_cnt) {
+                               int *tmp;
+
+                               opt.o_archive_id_cnt *= 2;
+                               tmp = realloc(opt.o_archive_id,
+                                             sizeof(*opt.o_archive_id) *
+                                             opt.o_archive_id_cnt);
+                               if (tmp == NULL)
+                                       return -ENOMEM;
+
+                               opt.o_archive_id = tmp;
                        }
-                       opt.o_archive_id[opt.o_archive_cnt] = val;
-                       opt.o_archive_cnt++;
+
+                       opt.o_archive_id[opt.o_archive_id_used++] = val;
                        break;
                }
                case 'b': /* -b and -c have both a number with unit as arg */
@@ -434,7 +469,7 @@ static int ct_mkdir_p(const char *path)
 
 static int ct_save_stripe(int src_fd, const char *src, const char *dst)
 {
-       char                     lov_file[PATH_MAX];
+       char                     lov_file[PATH_MAX + 8];
        char                     lov_buf[XATTR_SIZE_MAX];
        struct lov_user_md      *lum;
        int                      rc;
@@ -494,7 +529,7 @@ err_cleanup:
 
 static int ct_load_stripe(const char *src, void *lovea, size_t *lovea_size)
 {
-       char     lov_file[PATH_MAX];
+       char     lov_file[PATH_MAX + 4];
        int      rc;
        int      fd;
 
@@ -1007,8 +1042,8 @@ static int ct_archive(const struct hsm_action_item *hai, const long hal_flags)
        }
 
        if (rename_needed == true) {
-               char     tmp_src[PATH_MAX];
-               char     tmp_dst[PATH_MAX];
+               char     tmp_src[PATH_MAX + 8];
+               char     tmp_dst[PATH_MAX + 8];
 
                /* atomically replace old archived file */
                ct_path_archive(src, sizeof(src), opt.o_hsm_root,
@@ -1089,10 +1124,10 @@ static int ct_archive(const struct hsm_action_item *hai, const long hal_flags)
                                                 src);
                                        rcf = rcf ? rcf : -errno;
                                        goto fini_minor;
+                               }
                                /* unlink old symlink done */
                                CT_TRACE("remove old symlink '%s' pointing"
                                         " to '%s'", src, buf);
-                               }
                        } else {
                                /* symlink already ok */
                                CT_TRACE("symlink '%s' already pointing"
@@ -1286,7 +1321,12 @@ static int ct_remove(const struct hsm_action_item *hai, const long hal_flags)
                rc = -errno;
                CT_ERROR(rc, "cannot unlink '%s'", attr);
                err_minor++;
-               goto fini;
+
+               /* ignore the error when lov file does not exist. */
+               if (rc == -ENOENT)
+                       rc = 0;
+               else
+                       goto fini;
        }
 
 fini:
@@ -1426,7 +1466,8 @@ static int ct_import_one(const char *src, const char *dst)
                return 0;
 
        rc = llapi_hsm_import(dst,
-                             opt.o_archive_cnt ? opt.o_archive_id[0] : 0,
+                             opt.o_archive_id_used ?
+                             opt.o_archive_id[0] : 0,
                              &st, 0, 0, 0, 0, NULL, &fid);
        if (rc < 0) {
                CT_ERROR(rc, "cannot import '%s' from '%s'", dst, src);
@@ -1836,7 +1877,7 @@ static int ct_run(void)
        }
 
        rc = llapi_hsm_copytool_register(&ctdata, opt.o_mnt,
-                                        opt.o_archive_cnt,
+                                        opt.o_archive_id_used,
                                         opt.o_archive_id, 0);
        if (rc < 0) {
                CT_ERROR(rc, "cannot start copytool interface");
@@ -1969,6 +2010,12 @@ static int ct_cleanup(void)
                }
        }
 
+       if (opt.o_archive_id_cnt > 0) {
+               free(opt.o_archive_id);
+               opt.o_archive_id = NULL;
+               opt.o_archive_id_cnt = 0;
+       }
+
        return 0;
 }