X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Flhsmtool_posix.c;h=0f9c79331e993dfb5ccf02969ae2c1024c672e6e;hb=8b0b0892da03dc5de5cd4025b9d31c9217b1e6f1;hp=db0dd98f74075fc2ba0e24e40c79d79b3e7fef3d;hpb=02121ce3e801684b4b5602a55ca313c661471df7;p=fs%2Flustre-release.git

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index db0dd98..0f9c793 100644
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -43,12 +43,15 @@
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
+#include <pthread.h>
 #include <time.h>
+#include <unistd.h>
 #include <utime.h>
 #include <sys/time.h>
 #include <sys/xattr.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
+#include <libcfs/util/string.h>
 #include <lustre/lustre_idl.h>
 #include <lustre/lustreapi.h>
 
@@ -65,12 +68,6 @@
 # define NSEC_PER_SEC 1000000000UL
 #endif
 
-/* copytool uses a 32b bitmask field to register with kuc
- * archive num = 0 => all
- * archive num from 1 to 32
- */
-#define MAX_ARCHIVE_CNT (sizeof(__u32) * 8)
-
 enum ct_action {
 	CA_IMPORT = 1,
 	CA_REBIND,
@@ -86,7 +83,7 @@ struct options {
 	int			 o_verbose;
 	int			 o_copy_xattrs;
 	int			 o_archive_cnt;
-	int			 o_archive_id[MAX_ARCHIVE_CNT];
+	int			 o_archive_id[LL_HSM_MAX_ARCHIVE];
 	int			 o_report_int;
 	unsigned long long	 o_bandwidth;
 	size_t			 o_chunk_size;
@@ -246,11 +243,11 @@ static int ct_parseopts(int argc, char * const *argv)
 				long_opts, NULL)) != -1) {
 		switch (c) {
 		case 'A':
-			if ((opt.o_archive_cnt >= MAX_ARCHIVE_CNT) ||
-			    (atoi(optarg) >= MAX_ARCHIVE_CNT)) {
+			if ((opt.o_archive_cnt >= LL_HSM_MAX_ARCHIVE) ||
+			    (atoi(optarg) >= LL_HSM_MAX_ARCHIVE)) {
 				rc = -E2BIG;
 				CT_ERROR(rc, "archive number must be less"
-					 "than %zu", MAX_ARCHIVE_CNT);
+					 "than %zu", LL_HSM_MAX_ARCHIVE);
 				return rc;
 			}
 			opt.o_archive_id[opt.o_archive_cnt] = atoi(optarg);
@@ -352,7 +349,7 @@ static int ct_parseopts(int argc, char * const *argv)
 	CT_TRACE("action=%d src=%s dst=%s mount_point=%s",
 		 opt.o_action, opt.o_src, opt.o_dst, opt.o_mnt);
 
-	if (!opt.o_dry_run && opt.o_hsm_root == NULL) {
+	if (opt.o_hsm_root == NULL) {
 		rc = -EINVAL;
 		CT_ERROR(rc, "must specify a root directory for the backend");
 		return rc;
@@ -522,7 +519,7 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src,
 	struct stat		 dst_st;
 	char			*buf = NULL;
 	__u64			 write_total = 0;
-	__u64			 length;
+	__u64			 length = hai->hai_extent.length;
 	time_t			 last_report_time;
 	int			 rc = 0;
 	double			 start_ct_now = ct_now();
@@ -543,6 +540,14 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src,
 		return rc;
 	}
 
+	if (hai->hai_extent.offset > (__u64)src_st.st_size) {
+		rc = -EINVAL;
+		CT_ERROR(rc, "Trying to start reading past end ("LPU64" > "
+			 "%jd) of '%s' source file", hai->hai_extent.offset,
+			 (intmax_t)src_st.st_size, src);
+		return rc;
+	}
+
 	if (fstat(dst_fd, &dst_st) < 0) {
 		rc = -errno;
 		CT_ERROR(rc, "cannot stat '%s'", dst);
@@ -555,17 +560,9 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src,
 		return rc;
 	}
 
-	rc = lseek(src_fd, hai->hai_extent.offset, SEEK_SET);
-	if (rc < 0) {
-		rc = -errno;
-		CT_ERROR(rc,
-			 "cannot seek for read to "LPU64" (len %jd) in '%s'",
-			 hai->hai_extent.offset, (intmax_t)src_st.st_size, src);
-		return rc;
-	}
-
 	/* Don't read beyond a given extent */
-	length = min(hai->hai_extent.length, src_st.st_size);
+	if (length > src_st.st_size - hai->hai_extent.offset)
+		length = src_st.st_size - hai->hai_extent.offset;
 
 	start_time = last_bw_print = last_report_time = time(NULL);
 
@@ -917,7 +914,7 @@ static int ct_archive(const struct hsm_action_item *hai, const long hal_flags)
 		goto fini_major;
 	}
 
-	open_flags = O_WRONLY | O_NOFOLLOW | O_NONBLOCK;
+	open_flags = O_WRONLY | O_NOFOLLOW;
 	/* If extent is specified, don't truncate an old archived copy */
 	open_flags |= ((hai->hai_extent.length == -1) ? O_TRUNC : 0) | O_CREAT;
 
@@ -1170,7 +1167,7 @@ static int ct_restore(const struct hsm_action_item *hai, const long hal_flags)
 		goto fini;
 	}
 
-	src_fd = open(src, O_RDONLY | O_NOATIME | O_NONBLOCK | O_NOFOLLOW);
+	src_fd = open(src, O_RDONLY | O_NOATIME | O_NOFOLLOW);
 	if (src_fd < 0) {
 		rc = -errno;
 		CT_ERROR(rc, "cannot open '%s' for read", src);
@@ -1655,7 +1652,7 @@ static int ct_rebind_list(const char *list)
 	if (line)
 		free(line);
 
-	/* return 0 if all rebinds were sucessful */
+	/* return 0 if all rebinds were successful */
 	CT_TRACE("%u lines read from '%s', %u rebind successful", nl, list, ok);
 
 	return ok == nl ? 0 : -1;