LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec

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

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index 083d4c6..5dbe904 100644 (file)
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -469,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;
@@ -529,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;
 
@@ -699,7 +699,8 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src,
                                        CT_TRACE("bandwith control: %lluB/s "
                                                 "excess=%llu sleep for "
                                                 "%lld.%09lds",
-                                                opt.o_bandwidth, excess,
+                                                (unsigned long long)opt.o_bandwidth,
+                                                (unsigned long long)excess,
                                                 (long long)delay.tv_sec,
                                                 delay.tv_nsec);
                                        last_bw_print = now;
@@ -1042,8 +1043,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,
@@ -1321,7 +1322,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:
@@ -1536,10 +1542,9 @@ static int ct_import_recurse(const char *relpath)
        if (relpath == NULL)
                return -EINVAL;
 
-       /* Is relpath a FID? In which case SFID should expand to three
-        * elements. */
-       rc = sscanf(relpath, SFID, RFID(&import_fid));
-       if (rc == 3)
+       /* Is relpath a FID? */
+       rc = llapi_fid_parse(relpath, &import_fid, NULL);
+       if (!rc)
                return ct_import_fid(&import_fid);
 
        srcpath = path_concat(opt.o_hsm_root, relpath);
@@ -1686,8 +1691,9 @@ static int ct_rebind_list(const char *list)
 
        /* each line consists of 2 FID */
        while ((r = getline(&line, &line_size, filp)) != -1) {
-               struct lu_fid   old_fid;
-               struct lu_fid   new_fid;
+               struct lu_fid old_fid;
+               struct lu_fid new_fid;
+               char *next_fid;
 
                /* Ignore empty and commented out ('#...') lines. */
                if (should_ignore_line(line))
@@ -1695,12 +1701,17 @@ static int ct_rebind_list(const char *list)
 
                nl++;
 
-               rc = sscanf(line, SFID" "SFID, RFID(&old_fid), RFID(&new_fid));
-               if (rc != 6 || !fid_is_file(&old_fid) ||
-                   !fid_is_file(&new_fid)) {
-                       CT_ERROR(EINVAL,
-                                "'%s' FID expected near '%s', line %u",
-                                list, line, nl);
+               rc = llapi_fid_parse(line, &old_fid, &next_fid);
+               if (rc)
+                       goto error;
+               rc = llapi_fid_parse(next_fid, &new_fid, NULL);
+               if (rc)
+                       goto error;
+               if (!fid_is_file(&old_fid) || !fid_is_file(&new_fid))
+                       rc = -EINVAL;
+               if (rc) {
+error:                 CT_ERROR(rc, "%s:%u: two FIDs expected in '%s'",
+                                list, nl, line);
                        err_major++;
                        continue;
                }
@@ -1724,23 +1735,25 @@ static int ct_rebind_list(const char *list)
 
 static int ct_rebind(void)
 {
-       int     rc;
+       int rc;
 
        if (opt.o_dst) {
                struct lu_fid old_fid;
                struct lu_fid new_fid;
 
-               if (sscanf(opt.o_src, SFID, RFID(&old_fid)) != 3 ||
-                   !fid_is_file(&old_fid)) {
+               rc = llapi_fid_parse(opt.o_src, &old_fid, NULL);
+               if (!rc && !fid_is_file(&old_fid))
                        rc = -EINVAL;
-                       CT_ERROR(rc, "'%s' invalid FID format", opt.o_src);
+               if (rc) {
+                       CT_ERROR(rc, "invalid source FID '%s'", opt.o_src);
                        return rc;
                }
 
-               if (sscanf(opt.o_dst, SFID, RFID(&new_fid)) != 3 ||
-                   !fid_is_file(&new_fid)) {
+               rc = llapi_fid_parse(opt.o_dst, &new_fid, NULL);
+               if (!rc && !fid_is_file(&new_fid))
                        rc = -EINVAL;
-                       CT_ERROR(rc, "'%s' invalid FID format", opt.o_dst);
+               if (rc) {
+                       CT_ERROR(rc, "invalid destination FID '%s'", opt.o_dst);
                        return rc;
                }