LU-11776 utils: add support lfs find with mdt hash flag

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

diff --git a/lustre/utils/lsnapshot.c b/lustre/utils/lsnapshot.c
index 5de39b2..0f1539e 100644 (file)
--- a/lustre/utils/lsnapshot.c
+++ b/lustre/utils/lsnapshot.c
@@ -44,6 +44,7 @@
 
 #include <libcfs/util/list.h>
 #include <libcfs/util/ioctl.h>
+#include <libcfs/util/string.h>
 #include <linux/lustre/lustre_ioctl.h>
 #include <linux/lustre/lustre_barrier_user.h>
 
@@ -1186,8 +1187,8 @@ static int snapshot_inherit_prop(struct snapshot_instance *si,
                if (end)
                        *end = '\0';
 
-               rc = snprintf(cmd + len, size - len - 1,
-                             "-o %s=\"%s\" ", buf, ptr);
+               rc = scnprintf(cmd + len, size - len - 1,
+                              "-o %s=\"%s\" ", buf, ptr);
                if (rc <= 0)
                        return -EOVERFLOW;
 
@@ -1229,21 +1230,23 @@ static int __snapshot_create(struct snapshot_instance *si,
                        int len;
 
                        memset(cmd, 0, sizeof(cmd));
-                       len = snprintf(cmd, sizeof(cmd) - 1,
-                                      DRSH" '"DZFS" snapshot "
-                                      "-o lustre:fsname=%s "
-                                      "-o lustre:magic=%s "
-                                      "-o lustre:ctime=%llu "
-                                      "-o lustre:mtime=%llu ",
-                                      PRSH(si, st), PZFS(st), fsname,
-                                      SNAPSHOT_MAGIC, xtime, xtime);
+                       len = scnprintf(cmd, sizeof(cmd) - 1,
+                                       DRSH" '"DZFS" snapshot "
+                                       "-o lustre:fsname=%s "
+                                       "-o lustre:magic=%s "
+                                       "-o lustre:ctime=%llu "
+                                       "-o lustre:mtime=%llu ",
+                                       PRSH(si, st), PZFS(st), fsname,
+                                       SNAPSHOT_MAGIC,
+                                       (unsigned long long)xtime,
+                                       (unsigned long long)xtime);
                        if (len <= 0)
                                exit(-EOVERFLOW);
 
                        if (si->si_comment) {
-                               rc = snprintf(cmd + len, sizeof(cmd) - len - 1,
-                                             "-o lustre:comment=\"%s\" ",
-                                             si->si_comment);
+                               rc = scnprintf(cmd + len, sizeof(cmd) - len - 1,
+                                              "-o lustre:comment=\"%s\" ",
+                                              si->si_comment);
                                if (rc <= 0)
                                        exit(-EOVERFLOW);
 
@@ -1800,7 +1803,8 @@ static int __snapshot_modify(struct snapshot_instance *si,
                                         PRSH(si, st), PIMPORT(st), PZFS(st),
                                         PSSNAME(si, st), PSS_NEW(si, st),
                                         PZFS(st), si->si_comment,
-                                        PSS_NEW(si, st), PZFS(st), xtime,
+                                        PSS_NEW(si, st), PZFS(st),
+                                        (unsigned long long)xtime,
                                         PSS_NEW(si, st));
                        else if (si->si_new_ssname)
                                snprintf(cmd, sizeof(cmd) - 1,
@@ -1809,7 +1813,8 @@ static int __snapshot_modify(struct snapshot_instance *si,
                                         " set lustre:mtime=%llu "DSSNAME"'",
                                         PRSH(si, st), PIMPORT(st), PZFS(st),
                                         PSSNAME(si, st), PSS_NEW(si, st),
-                                        PZFS(st), xtime, PSS_NEW(si, st));
+                                        PZFS(st), (unsigned long long)xtime,
+                                        PSS_NEW(si, st));
                        else if (si->si_comment)
                                snprintf(cmd, sizeof(cmd) - 1,
                                         DRSH" '"DIMPORT"; "DZFS
@@ -1818,7 +1823,8 @@ static int __snapshot_modify(struct snapshot_instance *si,
                                         " set lustre:mtime=%llu "DSSNAME"'",
                                         PRSH(si, st), PIMPORT(st), PZFS(st),
                                         si->si_comment, PSSNAME(si, st),
-                                        PZFS(st), xtime, PSSNAME(si, st));
+                                        PZFS(st), (unsigned long long)xtime,
+                                        PSSNAME(si, st));
                        else
                                exit(-EINVAL);
 
@@ -1977,7 +1983,7 @@ static int snapshot_list_one(struct snapshot_instance *si,
                            strlen("lustre:ctime")) == 0) {
                        ptr = snapshot_first_skip_blank(buf);
                        if (ptr) {
-                               sscanf(ptr, "%llu", &xtime);
+                               xtime = (__u64)strtoull(ptr, NULL, 10);
                                printf("create_time: %s",
                                       ctime((time_t *)&xtime));
                        }
@@ -1988,7 +1994,7 @@ static int snapshot_list_one(struct snapshot_instance *si,
                            strlen("lustre:mtime")) == 0) {
                        ptr = snapshot_first_skip_blank(buf);
                        if (ptr) {
-                               sscanf(ptr, "%llu", &xtime);
+                               xtime = (__u64)strtoull(ptr, NULL, 10);
                                printf("modify_time: %s",
                                       ctime((time_t *)&xtime));
                        }