From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:16:32 +0000 (+1100)
Subject: Merge remote-tracking branch 'overlayfs/overlayfs-next'
X-Git-Tag: KARO-TXUL-2015-12-04~116
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=f5f7e6d4fff00c4d172767f66d42fa91baa819f6

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

f5f7e6d4fff00c4d172767f66d42fa91baa819f6
diff --cc fs/overlayfs/super.c
index e38ee0fed24a,97cacb525974..30128bbc2c4e
--- a/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;
  }