Merge remote-tracking branch 'overlayfs/overlayfs-next'

diff --cc fs/overlayfs/super.c
index e38ee0fed24a2f7a343f294a793b6abea93f6f97,97cacb525974d934fec6a5cd6bef740a305c688b..30128bbc2c4e8ae4a264d99af1ef0bed4bae8200
--- 1/fs/overlayfs/super.c
--- 2/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@@ -589,11 -609,13 +609,13 @@@ static int ovl_show_options(struct seq_
        struct super_block *sb = dentry->d_sb;
        struct ovl_fs *ufs = sb->s_fs_info;
  
 -      seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir);
 +      seq_show_option(m, "lowerdir", ufs->config.lowerdir);
        if (ufs->config.upperdir) {
 -              seq_printf(m, ",upperdir=%s", ufs->config.upperdir);
 -              seq_printf(m, ",workdir=%s", ufs->config.workdir);
 +              seq_show_option(m, "upperdir", ufs->config.upperdir);
 +              seq_show_option(m, "workdir", ufs->config.workdir);
        }
+       if (ufs->config.default_permissions)
+               seq_puts(m, ",default_permissions");
        return 0;
  }