From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 Jan 2013 15:08:41 +0000 (+0100)
Subject: libmount: keep MS_PROPAGATION flags in mnt_context_set_mflags() result
X-Git-Tag: v2.23-rc1~347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56a21c9336531e8c72406b3366fe35d951ad532a;p=thirdparty%2Futil-linux.git

libmount: keep MS_PROPAGATION flags in mnt_context_set_mflags() result

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

diff --git a/libmount/src/context.c b/libmount/src/context.c
index 2e28d650a8..6d57038349 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1212,6 +1212,8 @@ int mnt_context_set_mflags(struct libmnt_context *cxt, unsigned long flags)
 int mnt_context_get_mflags(struct libmnt_context *cxt, unsigned long *flags)
 {
 	int rc = 0;
+	struct list_head *p;
+
 	if (!cxt || !flags)
 		return -EINVAL;
 
@@ -1222,6 +1224,14 @@ int mnt_context_get_mflags(struct libmnt_context *cxt, unsigned long *flags)
 			rc = mnt_optstr_get_flags(o, flags,
 				    mnt_get_builtin_optmap(MNT_LINUX_MAP));
 	}
+
+	list_for_each(p, &cxt->addmounts) {
+		struct libmnt_addmount *ad =
+				list_entry(p, struct libmnt_addmount, mounts);
+
+		*flags |= ad->mountflags;
+	}
+
 	if (!rc)
 		*flags |= cxt->mountflags;
 	return rc;