LU-6835 build: add -Wall to CFLAGS for test/ and utils/

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

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index ebc9183..78ab4d8 100644 (file)
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -43,6 +43,7 @@
 #include <dirent.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <utime.h>
 #include <sys/syscall.h>
@@ -55,7 +56,6 @@
 #include <unistd.h>
 #endif
 
-#include <libcfs/libcfs.h>
 #include <lnet/lnetctl.h>
 #include <lustre/lustre_idl.h>
 #include <lustre/lustreapi.h>
@@ -71,7 +71,7 @@ struct hsm_copytool_private {
        struct kuc_hdr          *kuch;
        int                      mnt_fd;
        int                      open_by_fid_fd;
-       lustre_kernelcomm        kuc;
+       struct lustre_kernelcomm kuc;
        __u32                    archives;
 };
 
@@ -84,8 +84,6 @@ struct hsm_copyaction_private {
        lstat_t                                  stat;
 };
 
-#include <libcfs/libcfs.h>
-
 enum ct_progress_type {
        CT_START        = 0,
        CT_RUNNING      = 50,
@@ -680,6 +678,13 @@ int llapi_hsm_copytool_register(struct hsm_copytool_private **priv,
                return -EINVAL;
        }
 
+       if (archive_count > LL_HSM_MAX_ARCHIVE) {
+               llapi_err_noerrno(LLAPI_MSG_ERROR, "%d requested when maximum "
+                                 "of %zu archives supported", archive_count,
+                                 LL_HSM_MAX_ARCHIVE);
+               return -EINVAL;
+       }
+
        ct = calloc(1, sizeof(*ct));
        if (ct == NULL)
                return -ENOMEM;
@@ -717,14 +722,14 @@ int llapi_hsm_copytool_register(struct hsm_copytool_private **priv,
        /* no archives specified means "match all". */
        ct->archives = 0;
        for (rc = 0; rc < archive_count; rc++) {
-               if (archives[rc] > 8 * sizeof(ct->archives)) {
-                       llapi_err_noerrno(LLAPI_MSG_ERROR,
-                                         "maximum of %zu archives supported",
-                                         8 * sizeof(ct->archives));
+               if ((archives[rc] > LL_HSM_MAX_ARCHIVE) || (archives[rc] < 0)) {
+                       llapi_err_noerrno(LLAPI_MSG_ERROR, "%d requested when "
+                                         "archive id [0 - %zu] is supported",
+                                         archives[rc], LL_HSM_MAX_ARCHIVE);
                        rc = -EINVAL;
                        goto out_err;
                }
-               /* in the list we have a all archive wildcard
+               /* in the list we have an all archive wildcard
                 * so move to all archives mode
                 */
                if (archives[rc] == 0) {