From: Karel Zak <kzak@redhat.com>
Date: Fri, 15 Apr 2016 12:30:43 +0000 (+0200)
Subject: libmount: fix mnt_table_parse_stream() logic
X-Git-Tag: v2.28.1~56
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=46e07be47bac97ba1bb41493929e43f185702740;p=thirdparty%2Futil-linux.git

libmount: fix mnt_table_parse_stream() logic

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

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 23076bfc0d..0b858a043b 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -590,6 +590,9 @@ static int kernel_fs_postparse(struct libmnt_table *tb,
 			DBG(TAB, ul_debugobj(tb, "canonical root FS: %s", real));
 			rc = __mnt_fs_set_source_ptr(fs, real);
 		}
+		/* mnt_guess_system_root() returns 1 if not able to conver to
+		 * the real devname; ignore this problem */
+		rc = 0;
 	}
 
 	return rc;
@@ -644,8 +647,11 @@ int mnt_table_parse_stream(struct libmnt_table *tb, FILE *f, const char *filenam
 			rc = mnt_table_add_fs(tb, fs);
 			fs->flags |= flags;
 
-			if (rc == 0 && tb->fmt == MNT_FMT_MOUNTINFO)
+			if (rc == 0 && tb->fmt == MNT_FMT_MOUNTINFO) {
 				rc = kernel_fs_postparse(tb, fs, &tid, filename);
+				if (rc)
+					mnt_table_remove_fs(tb, fs);
+			}
 		}
 
 		if (rc) {