LU-5095 hsm: Allow receiving messages to be non-blocking

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

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index 31e5486..ff157dc 100644 (file)
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -488,8 +488,8 @@ static int ct_restore_stripe(const char *src, const char *dst, int dst_fd,
        rc = fsetxattr(dst_fd, XATTR_LUSTRE_LOV, lovea, lovea_size,
                       XATTR_CREATE);
        if (rc < 0) {
-               CT_ERROR(errno, "cannot set lov EA on '%s'", dst);
                rc = -errno;
+               CT_ERROR(rc, "cannot set lov EA on '%s'", dst);
        }
 
        return rc;
@@ -880,7 +880,7 @@ static int ct_archive(const struct hsm_action_item *hai, const long hal_flags)
 
        src_fd = llapi_hsm_action_get_fd(hcp);
        if (src_fd < 0) {
-               rc = -errno;
+               rc = src_fd;
                CT_ERROR(rc, "cannot open '%s' for read", src);
                goto fini_major;
        }
@@ -1139,6 +1139,11 @@ static int ct_restore(const struct hsm_action_item *hai, const long hal_flags)
        }
 
        dst_fd = llapi_hsm_action_get_fd(hcp);
+       if (dst_fd < 0) {
+               rc = dst_fd;
+               CT_ERROR(rc, "cannot open '%s' for write", dst);
+               goto fini;
+       }
 
        if (set_lovea) {
                /* the layout cannot be allocated through .fid so we have to
@@ -1758,8 +1763,9 @@ static int ct_run(void)
                llapi_error_callback_set(llapi_hsm_log_error);
        }
 
-       rc = llapi_hsm_copytool_register(&ctdata, opt.o_mnt, 0,
-                                        opt.o_archive_cnt, opt.o_archive_id);
+       rc = llapi_hsm_copytool_register(&ctdata, opt.o_mnt,
+                                        opt.o_archive_cnt,
+                                        opt.o_archive_id, 0);
        if (rc < 0) {
                CT_ERROR(rc, "cannot start copytool interface");
                return rc;
@@ -1780,8 +1786,6 @@ static int ct_run(void)
                if (rc == -ESHUTDOWN) {
                        CT_TRACE("shutting down");
                        break;
-               } else if (rc == -EAGAIN) {
-                       continue; /* msg not for us */
                } else if (rc < 0) {
                        CT_WARN("cannot receive action list: %s",
                                strerror(-rc));