From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2016 20:20:46 +0000 (-0800)
Subject: Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer... 
X-Git-Tag: v4.5-rc1~31
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=e9f57ebcba563e0cd532926cab83c92bb4d79360

Merge branch 'overlayfs-linus' of git://git./linux/kernel/git/mszeredi/vfs

Pull overlayfs updates from Miklos Szeredi:
 "This contains several bug fixes and a new mount option
  'default_permissions' that allows read-only exported NFS
  filesystems to be used as lower layer"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: check dentry positiveness in ovl_cleanup_whiteouts()
  ovl: setattr: check permissions before copy-up
  ovl: root: copy attr
  ovl: move super block magic number to magic.h
  ovl: use a minimal buffer in ovl_copy_xattr
  ovl: allow zero size xattr
  ovl: default permissions
---

e9f57ebcba563e0cd532926cab83c92bb4d79360
diff --cc fs/overlayfs/super.c
index e38ee0fed24a,b08bf4d3a405..a4cbdf9824c7
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@@ -589,11 -608,13 +608,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;
  }