Merge branch 'dmverity_options' of https://github.com/bluca/util-linux

[thirdparty/util-linux.git] / misc-utils / findmnt-verify.c

diff --git a/misc-utils/findmnt-verify.c b/misc-utils/findmnt-verify.c
index b32901d6631813306c6c29ff63527e8ad03758ab..2b6f5e7fa90c1adfa5a1910d9b715ad0ce86aa97 100644 (file)
--- a/misc-utils/findmnt-verify.c
+++ b/misc-utils/findmnt-verify.c
@@ -28,7 +28,8 @@ struct verify_context {
        int     nwarnings;
        int     nerrors;
 
-       unsigned int    target_printed : 1;
+       unsigned int    target_printed : 1,
+                       no_fsck : 1;
 };
 
 static void verify_mesg(struct verify_context *vfy, char type, const char *fmt, va_list ap)
@@ -97,7 +98,9 @@ static int verify_order(struct verify_context *vfy)
 
        /* set iterator position to 'fs' */
        mnt_table_set_iter(vfy->tb, itr, vfy->fs);
-       mnt_table_next_fs(vfy->tb, itr, &next);
+
+       if (mnt_table_next_fs(vfy->tb, itr, &next) != 0)
+               goto done;
 
        /* scan all next filesystems */
        while (mnt_table_next_fs(vfy->tb, itr, &next) == 0) {
@@ -126,14 +129,13 @@ done:
 static int verify_target(struct verify_context *vfy)
 {
        const char *tgt = mnt_fs_get_target(vfy->fs);
-       const char *cn = tgt;
        struct stat sb;
 
        if (!tgt)
                return verify_err(vfy, _("undefined target (fs_file)"));
 
        if (!(flags & FL_NOCACHE)) {
-               cn = mnt_resolve_target(tgt, cache);
+               const char *cn = mnt_resolve_target(tgt, cache);
                if (!cn)
                        return -ENOMEM;
                if (strcmp(cn, tgt) != 0)
@@ -409,6 +411,8 @@ static int verify_fstype(struct verify_context *vfy)
                        isauto = 1;
                else if (strcmp(type, "swap") == 0)
                        isswap = 1;
+               else if (strcmp(type, "xfs") == 0)
+                       vfy->no_fsck = 1;
 
                if (!isswap && !isauto && !none && !is_supported_filesystem(vfy, type))
                        verify_warn(vfy, _("%s seems unsupported by the current kernel"), type);
@@ -423,6 +427,7 @@ static int verify_fstype(struct verify_context *vfy)
 
        if (realtype) {
                isswap = strcmp(realtype, "swap") == 0;
+               vfy->no_fsck = strcmp(realtype, "xfs") == 0;
 
                if (type && !isauto && strcmp(type, realtype) != 0)
                        return verify_err(vfy, _("%s does not match with on-disk %s"), type, realtype);
@@ -441,7 +446,7 @@ static int verify_passno(struct verify_context *vfy)
        int passno = mnt_fs_get_passno(vfy->fs);
        const char *tgt = mnt_fs_get_target(vfy->fs);
 
-       if (tgt && strcmp("/", tgt) == 0 && passno != 1)
+       if (tgt && strcmp("/", tgt) == 0 && passno != 1 && !vfy->no_fsck)
                return verify_warn(vfy, _("recommended root FS passno is 1 (current is %d)"), passno);
 
        return 0;
@@ -464,7 +469,7 @@ static int verify_filesystem(struct verify_context *vfy)
        if (!rc)
                rc = verify_fstype(vfy);
        if (!rc)
-               rc = verify_passno(vfy);
+               rc = verify_passno(vfy);        /* depends on verify_fstype() */
 
        return rc;
 }
@@ -493,6 +498,8 @@ int verify_table(struct libmnt_table *tb)
 
        while (rc == 0 && (vfy.fs = get_next_fs(tb, itr))) {
                vfy.target_printed = 0;
+               vfy.no_fsck = 0;
+
                if (check_order)
                        rc = verify_order(&vfy);
                if (!rc)