mount: fix recursively propagation mounting

Provide the recursive flag of propagation mounting. Recursive flag could
be used together with propagation flag.

[kzak@redhat.com: - add MS_SILENT to acceptable propagation flags,
                  - fix new code in libmount too]

Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Dong Hao <haodong@linux.vnet.ibm.com>

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 4174f84cbfd338e9eb22e1c89e191e94b7861631..976f459270cc4e73ed8066c545e9951f5aca8816 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -48,9 +48,10 @@ static int fix_optstr(struct libmnt_context *cxt)
 
        fs = cxt->fs;
 
-       /* The propagation flags should not be used together with any other flags */
+       /* The propagation flags should not be used together with any other
+        * flags (except MS_REC and MS_SILENT) */
        if (cxt->mountflags & MS_PROPAGATION)
-               cxt->mountflags &= MS_PROPAGATION;
+               cxt->mountflags &= (MS_PROPAGATION | MS_REC | MS_SILENT);
 
        if (!mnt_optstr_get_option(fs->user_optstr, "user", &val, &valsz)) {
                if (val) {

diff --git a/mount/mount.c b/mount/mount.c
index 2ce48293e23fec6b48a6ca6484adb775806716f6..396f357d91e61ba38489c044bd5abae1c4a9f19d 100644 (file)
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -601,9 +601,10 @@ parse_opts (const char *options, int *flags, char **extra_opts) {
 
        *flags |= mounttype;
 
-       /* The propagation flags should not be used together with any other flags */
+       /* The propagation flags should not be used together with any
+        * other flags (except MS_REC and MS_SILENT) */
        if (*flags & MS_PROPAGATION)
-               *flags &= MS_PROPAGATION;
+               *flags &= (MS_PROPAGATION | MS_REC | MS_SILENT);
 }
 
 /* Try to build a canonical options string.  */