X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Flhsmtool_posix.c;h=93e72bef6369e37bd4cf3f13f2935ccc257d49ef;hp=dda85512601562997a49198ddd518ba8af9fa205;hb=5e0ad2afa62e9eb7cf4f48c394c6a84c74a02f2f;hpb=dd918fb51ed8ba180f888a242df20e5a4af29af2 diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c index dda8551..93e72be 100644 --- a/lustre/utils/lhsmtool_posix.c +++ b/lustre/utils/lhsmtool_posix.c @@ -23,6 +23,7 @@ * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies * alternatives * + * Copyright (c) 2013, 2016, Intel Corporation. */ /* HSM copytool program for POSIX filesystem-based HSM's. * @@ -36,19 +37,27 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include +#include #include #include #include +#include #include #include #include +#include #include +#include #include +#include #include #include #include #include -#include + +#include +#include #include /* Progress reporting period */ @@ -64,12 +73,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, @@ -84,8 +87,9 @@ struct options { int o_shadow_tree; int o_verbose; int o_copy_xattrs; - int o_archive_cnt; - int o_archive_id[MAX_ARCHIVE_CNT]; + 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; @@ -207,54 +211,110 @@ static void usage(const char *name, int rc) static int ct_parseopts(int argc, char * const *argv) { struct option long_opts[] = { - {"abort-on-error", no_argument, &opt.o_abort_on_error, 1}, - {"abort_on_error", no_argument, &opt.o_abort_on_error, 1}, - {"archive", required_argument, NULL, 'A'}, - {"bandwidth", required_argument, NULL, 'b'}, - {"chunk-size", required_argument, NULL, 'c'}, - {"chunk_size", required_argument, NULL, 'c'}, - {"daemon", no_argument, &opt.o_daemonize, 1}, - {"event-fifo", required_argument, NULL, 'f'}, - {"event_fifo", required_argument, NULL, 'f'}, - {"dry-run", no_argument, &opt.o_dry_run, 1}, - {"help", no_argument, NULL, 'h'}, - {"hsm-root", required_argument, NULL, 'p'}, - {"hsm_root", required_argument, NULL, 'p'}, - {"import", no_argument, NULL, 'i'}, - {"max-sequence", no_argument, NULL, 'M'}, - {"max_sequence", no_argument, NULL, 'M'}, - {"no-attr", no_argument, &opt.o_copy_attrs, 0}, - {"no_attr", no_argument, &opt.o_copy_attrs, 0}, - {"no-shadow", no_argument, &opt.o_shadow_tree, 0}, - {"no_shadow", no_argument, &opt.o_shadow_tree, 0}, - {"no-xattr", no_argument, &opt.o_copy_xattrs, 0}, - {"no_xattr", no_argument, &opt.o_copy_xattrs, 0}, - {"quiet", no_argument, NULL, 'q'}, - {"rebind", no_argument, NULL, 'r'}, - {"update-interval", required_argument, NULL, 'u'}, - {"update_interval", required_argument, NULL, 'u'}, - {"verbose", no_argument, NULL, 'v'}, - {0, 0, 0, 0} - }; - int c, rc; - unsigned long long value; - unsigned long long unit; + { .val = 1, .name = "abort-on-error", + .flag = &opt.o_abort_on_error, .has_arg = no_argument }, + { .val = 1, .name = "abort_on_error", + .flag = &opt.o_abort_on_error, .has_arg = no_argument }, + { .val = 'A', .name = "archive", .has_arg = required_argument }, + { .val = 'b', .name = "bandwidth", .has_arg = required_argument }, + { .val = 'c', .name = "chunk-size", .has_arg = required_argument }, + { .val = 'c', .name = "chunk_size", .has_arg = required_argument }, + { .val = 1, .name = "daemon", .has_arg = no_argument, + .flag = &opt.o_daemonize }, + { .val = 'f', .name = "event-fifo", .has_arg = required_argument }, + { .val = 'f', .name = "event_fifo", .has_arg = required_argument }, + { .val = 1, .name = "dry-run", .has_arg = no_argument, + .flag = &opt.o_dry_run }, + { .val = 'h', .name = "help", .has_arg = no_argument }, + { .val = 'i', .name = "import", .has_arg = no_argument }, + { .val = 'M', .name = "max-sequence", .has_arg = no_argument }, + { .val = 'M', .name = "max_sequence", .has_arg = no_argument }, + { .val = 0, .name = "no-attr", .has_arg = no_argument, + .flag = &opt.o_copy_attrs }, + { .val = 0, .name = "no_attr", .has_arg = no_argument, + .flag = &opt.o_copy_attrs }, + { .val = 0, .name = "no-shadow", .has_arg = no_argument, + .flag = &opt.o_shadow_tree }, + { .val = 0, .name = "no_shadow", .has_arg = no_argument, + .flag = &opt.o_shadow_tree }, + { .val = 0, .name = "no-xattr", .has_arg = no_argument, + .flag = &opt.o_copy_xattrs }, + { .val = 0, .name = "no_xattr", .has_arg = no_argument, + .flag = &opt.o_copy_xattrs }, + { .val = 'p', .name = "hsm-root", .has_arg = required_argument }, + { .val = 'p', .name = "hsm_root", .has_arg = required_argument }, + { .val = 'q', .name = "quiet", .has_arg = no_argument }, + { .val = 'r', .name = "rebind", .has_arg = no_argument }, + { .val = 'u', .name = "update-interval", + .has_arg = required_argument }, + { .val = 'u', .name = "update_interval", + .has_arg = required_argument }, + { .val = 'v', .name = "verbose", .has_arg = no_argument }, + { .name = NULL } }; + 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) { - case 'A': - if ((opt.o_archive_cnt >= MAX_ARCHIVE_CNT) || - (atoi(optarg) >= MAX_ARCHIVE_CNT)) { - rc = -E2BIG; - CT_ERROR(rc, "archive number must be less" - "than %zu", MAX_ARCHIVE_CNT); + case 'A': { + char *end = NULL; + int val = strtol(optarg, &end, 10); + + if (*end != '\0') { + rc = -EINVAL; + CT_ERROR(rc, "invalid archive-id: '%s'", + optarg); return rc; } - opt.o_archive_id[opt.o_archive_cnt] = atoi(optarg); - opt.o_archive_cnt++; + /* 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; + } + + /* 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_id_used++] = val; break; + } case 'b': /* -b and -c have both a number with unit as arg */ case 'c': unit = ONE_MB; @@ -351,7 +411,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; @@ -409,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; @@ -469,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; @@ -521,7 +581,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(); @@ -542,6 +602,15 @@ 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 (%ju > " + "%jd) of '%s' source file", + (uintmax_t)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); @@ -554,17 +623,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); @@ -587,8 +648,8 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src, goto out; } - CT_TRACE("start copy of "LPU64" bytes from '%s' to '%s'", - length, src, dst); + CT_TRACE("start copy of %ju bytes from '%s' to '%s'", + (uintmax_t)length, src, dst); while (write_total < length) { ssize_t rsize; @@ -661,8 +722,10 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src, now = time(NULL); if (now >= last_report_time + opt.o_report_int) { last_report_time = now; - CT_TRACE("%%"LPU64" ", 100 * write_total / length); - he.length = write_total; + CT_TRACE("%%%ju ", (uintmax_t)(100 * write_total / length)); + /* only give the length of the write since the last + * progress report */ + he.length = offset - he.offset; rc = llapi_hsm_action_progress(hcp, &he, length, 0); if (rc < 0) { /* Action has been canceled or something wrong @@ -671,6 +734,7 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src, " '%s'->'%s' failed", src, dst); goto out; } + he.offset = offset; } rc = 0; } @@ -699,8 +763,8 @@ out: if (buf != NULL) free(buf); - CT_TRACE("copied "LPU64" bytes in %f seconds", - length, ct_now() - start_ct_now); + CT_TRACE("copied %ju bytes in %f seconds", + (uintmax_t)length, ct_now() - start_ct_now); return rc; } @@ -776,14 +840,14 @@ static int ct_copy_xattr(const char *src, const char *dst, int src_fd, } static int ct_path_lustre(char *buf, int sz, const char *mnt, - const lustre_fid *fid) + const struct lu_fid *fid) { return snprintf(buf, sz, "%s/%s/fid/"DFID_NOBRACE, mnt, dot_lustre_name, PFID(fid)); } static int ct_path_archive(char *buf, int sz, const char *archive_dir, - const lustre_fid *fid) + const struct lu_fid *fid) { return snprintf(buf, sz, "%s/%04x/%04x/%04x/%04x/%04x/%04x/" DFID_NOBRACE, archive_dir, @@ -834,8 +898,8 @@ static int ct_fini(struct hsm_copyaction_private **phcp, int rc; CT_TRACE("Action completed, notifying coordinator " - "cookie="LPX64", FID="DFID", hp_flags=%d err=%d", - hai->hai_cookie, PFID(&hai->hai_fid), + "cookie=%#jx, FID="DFID", hp_flags=%d err=%d", + (uintmax_t)hai->hai_cookie, PFID(&hai->hai_fid), hp_flags, -ct_rc); ct_path_lustre(lstr, sizeof(lstr), opt.o_mnt, &hai->hai_fid); @@ -853,8 +917,8 @@ static int ct_fini(struct hsm_copyaction_private **phcp, rc = llapi_hsm_action_end(phcp, &hai->hai_extent, hp_flags, abs(ct_rc)); if (rc == -ECANCELED) CT_ERROR(rc, "completed action on '%s' has been canceled: " - "cookie="LPX64", FID="DFID, lstr, hai->hai_cookie, - PFID(&hai->hai_fid)); + "cookie=%#jx, FID="DFID, lstr, + (uintmax_t)hai->hai_cookie, PFID(&hai->hai_fid)); else if (rc < 0) CT_ERROR(rc, "llapi_hsm_action_end() on '%s' failed", lstr); else @@ -868,7 +932,8 @@ static int ct_archive(const struct hsm_action_item *hai, const long hal_flags) { struct hsm_copyaction_private *hcp = NULL; char src[PATH_MAX]; - char dst[PATH_MAX] = ""; + char dst[PATH_MAX + 4] = ""; + char root[PATH_MAX] = ""; int rc; int rcf = 0; bool rename_needed = false; @@ -886,14 +951,16 @@ static int ct_archive(const struct hsm_action_item *hai, const long hal_flags) * destination = lustre FID */ ct_path_lustre(src, sizeof(src), opt.o_mnt, &hai->hai_dfid); - ct_path_archive(dst, sizeof(dst), opt.o_hsm_root, &hai->hai_fid); + ct_path_archive(root, sizeof(root), opt.o_hsm_root, &hai->hai_fid); if (hai->hai_extent.length == -1) { /* whole file, write it to tmp location and atomically * replace old archived file */ - strlcat(dst, "_tmp", sizeof(dst)); + snprintf(dst, sizeof(dst), "%s_tmp", root); /* we cannot rely on the same test because ct_copy_data() * updates hai_extent.length */ rename_needed = true; + } else { + snprintf(dst, sizeof(dst), "%s", root); } CT_TRACE("archiving '%s' to '%s'", src, dst); @@ -916,7 +983,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; @@ -975,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, @@ -1057,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" @@ -1169,7 +1236,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); @@ -1224,7 +1291,7 @@ fini: static int ct_remove(const struct hsm_action_item *hai, const long hal_flags) { struct hsm_copyaction_private *hcp = NULL; - char dst[PATH_MAX]; + char dst[PATH_MAX], attr[PATH_MAX + 4]; int rc; rc = ct_begin(&hcp, hai); @@ -1248,11 +1315,11 @@ static int ct_remove(const struct hsm_action_item *hai, const long hal_flags) goto fini; } - strlcat(dst, ".lov", sizeof(dst)); - rc = unlink(dst); + snprintf(attr, sizeof(attr), "%s.lov", dst); + rc = unlink(attr); if (rc < 0) { rc = -errno; - CT_ERROR(rc, "cannot unlink '%s'", dst); + CT_ERROR(rc, "cannot unlink '%s'", attr); err_minor++; goto fini; } @@ -1275,9 +1342,9 @@ static int ct_process_item(struct hsm_action_item *hai, const long hal_flags) int linkno = 0; sprintf(fid, DFID, PFID(&hai->hai_fid)); - CT_TRACE("'%s' action %s reclen %d, cookie="LPX64, + CT_TRACE("'%s' action %s reclen %d, cookie=%#jx", fid, hsm_copytool_action2name(hai->hai_action), - hai->hai_len, hai->hai_cookie); + hai->hai_len, (uintmax_t)hai->hai_cookie); rc = llapi_fid2path(opt.o_mnt, fid, path, sizeof(path), &recno, &linkno); if (rc < 0) @@ -1378,7 +1445,7 @@ static int ct_process_item_async(const struct hsm_action_item *hai, static int ct_import_one(const char *src, const char *dst) { char newarc[PATH_MAX]; - lustre_fid fid; + struct lu_fid fid; struct stat st; int rc; @@ -1394,7 +1461,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); @@ -1436,7 +1504,7 @@ static char *path_concat(const char *dirname, const char *basename) return result; } -static int ct_import_fid(const lustre_fid *import_fid) +static int ct_import_fid(const struct lu_fid *import_fid) { char fid_path[PATH_MAX]; int rc; @@ -1460,9 +1528,9 @@ static int ct_import_fid(const lustre_fid *import_fid) static int ct_import_recurse(const char *relpath) { DIR *dir; - struct dirent ent, *cookie = NULL; + struct dirent *ent; char *srcpath, *newpath; - lustre_fid import_fid; + struct lu_fid import_fid; int rc; if (relpath == NULL) @@ -1497,31 +1565,20 @@ static int ct_import_recurse(const char *relpath) } free(srcpath); - while (1) { - rc = readdir_r(dir, &ent, &cookie); - if (rc != 0) { - rc = -errno; - CT_ERROR(rc, "cannot readdir_r '%s'", relpath); - err_major++; - goto out; - } else if ((rc == 0) && (cookie == NULL)) { - /* end of directory */ - break; - } - - if (!strcmp(ent.d_name, ".") || - !strcmp(ent.d_name, "..")) + while ((ent = readdir(dir)) != NULL) { + if (!strcmp(ent->d_name, ".") || + !strcmp(ent->d_name, "..")) continue; /* New relative path */ - newpath = path_concat(relpath, ent.d_name); + newpath = path_concat(relpath, ent->d_name); if (newpath == NULL) { err_major++; rc = -ENOMEM; goto out; } - if (ent.d_type == DT_DIR) { + if (ent->d_type == DT_DIR) { rc = ct_import_recurse(newpath); } else { char src[PATH_MAX]; @@ -1556,7 +1613,8 @@ out: return rc; } -static int ct_rebind_one(const lustre_fid *old_fid, const lustre_fid *new_fid) +static int ct_rebind_one(const struct lu_fid *old_fid, + const struct lu_fid *new_fid) { char src[PATH_MAX]; char dst[PATH_MAX]; @@ -1568,6 +1626,9 @@ static int ct_rebind_one(const lustre_fid *old_fid, const lustre_fid *new_fid) ct_path_archive(dst, sizeof(dst), opt.o_hsm_root, new_fid); if (!opt.o_dry_run) { + char src_attr[PATH_MAX + 4]; + char dst_attr[PATH_MAX + 4]; + ct_mkdir_p(dst); if (rename(src, dst)) { rc = -errno; @@ -1575,16 +1636,17 @@ static int ct_rebind_one(const lustre_fid *old_fid, const lustre_fid *new_fid) return -errno; } /* rename lov file */ - strlcat(src, ".lov", sizeof(src)); - strlcat(dst, ".lov", sizeof(dst)); - if (rename(src, dst)) - CT_ERROR(errno, "cannot rename '%s' to '%s'", src, dst); + snprintf(src_attr, sizeof(src_attr), "%s.lov", src); + snprintf(dst_attr, sizeof(dst_attr), "%s.lov", dst); + if (rename(src_attr, dst_attr)) + CT_ERROR(errno, "cannot rename '%s' to '%s'", + src_attr, dst_attr); } return 0; } -static bool fid_is_file(lustre_fid *fid) +static bool fid_is_file(struct lu_fid *fid) { return fid_is_norm(fid) || fid_is_igif(fid); } @@ -1624,8 +1686,8 @@ static int ct_rebind_list(const char *list) /* each line consists of 2 FID */ while ((r = getline(&line, &line_size, filp)) != -1) { - lustre_fid old_fid; - lustre_fid new_fid; + struct lu_fid old_fid; + struct lu_fid new_fid; /* Ignore empty and commented out ('#...') lines. */ if (should_ignore_line(line)) @@ -1654,7 +1716,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; @@ -1665,8 +1727,8 @@ static int ct_rebind(void) int rc; if (opt.o_dst) { - lustre_fid old_fid; - lustre_fid new_fid; + 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)) { @@ -1698,7 +1760,7 @@ static int ct_dir_level_max(const char *dirpath, __u16 *sub_seqmax) DIR *dir; int rc; __u16 sub_seq; - struct dirent ent, *cookie = NULL; + struct dirent *ent; *sub_seqmax = 0; @@ -1709,26 +1771,29 @@ static int ct_dir_level_max(const char *dirpath, __u16 *sub_seqmax) return rc; } - while ((rc = readdir_r(dir, &ent, &cookie)) == 0) { - if (cookie == NULL) + do { + errno = 0; + ent = readdir(dir); + if (ent == NULL) { /* end of directory. * rc is 0 and seqmax contains the max value. */ + rc = -errno; + if (rc) + CT_ERROR(rc, "cannot readdir '%s'", dirpath); goto out; + } - if (!strcmp(ent.d_name, ".") || !strcmp(ent.d_name, "..")) + if (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) continue; - if (sscanf(ent.d_name, "%hx", &sub_seq) != 1) { + if (sscanf(ent->d_name, "%hx", &sub_seq) != 1) { CT_TRACE("'%s' has an unexpected dirname format, " - "skip entry", ent.d_name); + "skip entry", ent->d_name); continue; } if (sub_seq > *sub_seqmax) *sub_seqmax = sub_seq; - } - rc = -errno; - CT_ERROR(rc, "cannot readdir_r '%s'", dirpath); - + } while (1); out: closedir(dir); return rc; @@ -1741,7 +1806,7 @@ static int ct_max_sequence(void) __u64 seq = 0; __u16 subseq; - strlcpy(path, opt.o_hsm_root, sizeof(path)); + snprintf(path, sizeof(path), "%s", opt.o_hsm_root); /* FID sequence is stored in top-level directory names: * hsm_root/16bits (high weight)/16 bits/16 bits/16 bits (low weight). */ @@ -1760,7 +1825,7 @@ static int ct_max_sequence(void) path[sizeof(path) - 1] = '\0'; } - printf("max_sequence: "LPX64"\n", seq); + printf("max_sequence: %#jx\n", (uintmax_t)seq); return 0; } @@ -1773,13 +1838,18 @@ static void handler(int signal) * does successfully unmount and the mount is actually gone, but the * mtab entry remains. So this just makes mtab happier. */ llapi_hsm_copytool_unregister(&ctdata); + + /* Also remove fifo upon signal as during normal/error exit */ + if (opt.o_event_fifo != NULL) + llapi_hsm_unregister_event_fifo(opt.o_event_fifo); _exit(1); } /* Daemon waits for messages from the kernel; run it in the background. */ static int ct_run(void) { - int rc; + struct sigaction cleanup_sigaction; + int rc; if (opt.o_daemonize) { rc = daemon(1, 1); @@ -1802,21 +1872,24 @@ 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"); return rc; } - signal(SIGINT, handler); - signal(SIGTERM, handler); + memset(&cleanup_sigaction, 0, sizeof(cleanup_sigaction)); + cleanup_sigaction.sa_handler = handler; + sigemptyset(&cleanup_sigaction.sa_mask); + sigaction(SIGINT, &cleanup_sigaction, NULL); + sigaction(SIGTERM, &cleanup_sigaction, NULL); while (1) { - struct hsm_action_list *hal; - struct hsm_action_item *hai; - int msgsize; - int i = 0; + struct hsm_action_list *hal; + struct hsm_action_item *hai; + int msgsize; + int i = 0; CT_TRACE("waiting for message from kernel"); @@ -1932,6 +2005,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; } @@ -1939,7 +2018,7 @@ int main(int argc, char **argv) { int rc; - strlcpy(cmd_name, basename(argv[0]), sizeof(cmd_name)); + snprintf(cmd_name, sizeof(cmd_name), "%s", basename(argv[0])); rc = ct_parseopts(argc, argv); if (rc < 0) { CT_WARN("try '%s --help' for more information", cmd_name); @@ -1975,4 +2054,3 @@ error_cleanup: return -rc; } -