Merge git://git.infradead.org/mtd-2.6

[~andy/linux] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index d99bcf59e4c2fd23b2c03d2c9ed7471f7b2b230e..fe59bd145d214b0157b75dd7b441c91e24dcb56c 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1695,7 +1695,7 @@ static int graft_tree(struct vfsmount *mnt, struct path *path)
 
 static int flags_to_propagation_type(int flags)
 {
-       int type = flags & ~MS_REC;
+       int type = flags & ~(MS_REC | MS_SILENT);
 
        /* Fail if any non-propagation flags are set */
        if (type & ~(MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))