From: Karel Zak <kzak@redhat.com>
Date: Mon, 20 Feb 2012 21:22:58 +0000 (+0100)
Subject: fsck: don't try to call fsck for undefined fs type
X-Git-Tag: v2.22-rc1~624
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7064679f57d195974b42b680cea940c2f2756859;p=thirdparty%2Futil-linux.git

fsck: don't try to call fsck for undefined fs type

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fsck/fsck.c b/fsck/fsck.c
index ceaa5a62c1..0945c58201 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -465,7 +465,8 @@ static char *find_fsck(const char *type)
 
 	for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
 		sprintf(prog, tpl, s, type);
-		if (stat(prog, &st) == 0) break;
+		if (stat(prog, &st) == 0)
+			break;
 	}
 	free(p);
 
@@ -1003,8 +1004,12 @@ static int ignore(struct libmnt_fs *fs)
 		return 1;
 
 	type = mnt_fs_get_fstype(fs);
-	if (!type)
-		return 0;		/* should not happen */
+	if (!type) {
+		if (verbose)
+			printf(_("%s: skipping unknown filesystem type\n"),
+				fs_get_device(fs));
+		return 1;
+	}
 
 	/* Are we ignoring this type? */
 	if (fs_ignored_type(fs))