Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro: "Assorted fixes, most in overlayfs land" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: ovl: ovl_dir_fsync() cleanup ovl: update MAINTAINERS ovl: pass dentry into ovl_dir_read_merged() ovl: use lockless_dereference() for upperdentry ovl: allow filenames with comma ovl: fix race in private xattr checks ovl: fix remove/copy-up race ovl: rename filesystem type to "overlay" isofs: avoid unused function warning vfs: fix reference leak in d_prune_aliases()

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "Assorted fixes, most in overlayfs land" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: ovl: ovl_dir_fsync() cleanup ovl: update MAINTAINERS ovl: pass dentry into ovl_dir_read_merged() ovl: use lockless_dereference() for upperdentry ovl: allow filenames with comma ovl: fix race in private xattr checks ovl: fix remove/copy-up race ovl: rename filesystem type to "overlay" isofs: avoid unused function warning vfs: fix reference leak in d_prune_aliases()
Linus Torvalds
2 parents 8a84e01e14 3035b675ad
Showing 11 changed files Side-by-side Diff
Documentation/filesystems/overlayfs.txt
MAINTAINERS
fs/Makefile
fs/dcache.c
fs/isofs/inode.c
fs/overlayfs/Kconfig
fs/overlayfs/Makefile
fs/overlayfs/dir.c
fs/overlayfs/inode.c
fs/overlayfs/readdir.c
fs/overlayfs/super.c
@@ -64,7 +64,7 @@
 At mount time, the two directories given as mount options "lowerdir" and
 "upperdir" are combined into a merged directory:
  
-  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\
+  mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\
 workdir=/work /merged
  
 The "workdir" needs to be an empty directory on the same filesystem
@@ -6888,11 +6888,12 @@
 F:	include/scsi/osd_*
 F:	fs/exofs/
  
-OVERLAYFS FILESYSTEM
+OVERLAY FILESYSTEM
 M:	Miklos Szeredi <miklos@szeredi.hu>
-L:	linux-fsdevel@vger.kernel.org
+L:	linux-unionfs@vger.kernel.org
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
 S:	Supported
-F:	fs/overlayfs/*
+F:	fs/overlayfs/
 F:	Documentation/filesystems/overlayfs.txt
  
 P54 WIRELESS DRIVER
@@ -104,7 +104,7 @@
 obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/
 obj-$(CONFIG_ADFS_FS)		+= adfs/
 obj-$(CONFIG_FUSE_FS)		+= fuse/
-obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/
+obj-$(CONFIG_OVERLAY_FS)	+= overlayfs/
 obj-$(CONFIG_UDF_FS)		+= udf/
 obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/
 obj-$(CONFIG_OMFS_FS)		+= omfs/
@@ -778,6 +778,7 @@
 			struct dentry *parent = lock_parent(dentry);
 			if (likely(!dentry->d_lockref.count)) {
 				__dentry_kill(dentry);
+				dput(parent);
 				goto restart;
 			}
 			if (parent)
@@ -174,27 +174,6 @@
  * Compute the hash for the isofs name corresponding to the dentry.
  */
 static int
-isofs_hash_common(struct qstr *qstr, int ms)
-{
-	const char *name;
-	int len;
-
-	len = qstr->len;
-	name = qstr->name;
-	if (ms) {
-		while (len && name[len-1] == '.')
-			len--;
-	}
-
-	qstr->hash = full_name_hash(name, len);
-
-	return 0;
-}
-
-/*
- * Compute the hash for the isofs name corresponding to the dentry.
- */
-static int
 isofs_hashi_common(struct qstr *qstr, int ms)
 {
 	const char *name;
@@ -263,6 +242,27 @@
 }
  
 #ifdef CONFIG_JOLIET
+/*
+ * Compute the hash for the isofs name corresponding to the dentry.
+ */
+static int
+isofs_hash_common(struct qstr *qstr, int ms)
+{
+	const char *name;
+	int len;
+
+	len = qstr->len;
+	name = qstr->name;
+	if (ms) {
+		while (len && name[len-1] == '.')
+			len--;
+	}
+
+	qstr->hash = full_name_hash(name, len);
+
+	return 0;
+}
+
 static int
 isofs_hash_ms(const struct dentry *dentry, struct qstr *qstr)
 {
-config OVERLAYFS_FS
+config OVERLAY_FS
 	tristate "Overlay filesystem support"
 	help
 	  An overlay filesystem combines two filesystems - an 'upper' filesystem
@@ -2,7 +2,7 @@
 # Makefile for the overlay filesystem.
 #
  
-obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
+obj-$(CONFIG_OVERLAY_FS) += overlay.o
  
-overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
+overlay-objs := super.o inode.o dir.o readdir.o copy_up.o
@@ -284,8 +284,7 @@
 	return ERR_PTR(err);
 }
  
-static struct dentry *ovl_check_empty_and_clear(struct dentry *dentry,
-						enum ovl_path_type type)
+static struct dentry *ovl_check_empty_and_clear(struct dentry *dentry)
 {
 	int err;
 	struct dentry *ret = NULL;
@@ -294,8 +293,17 @@
 	err = ovl_check_empty_dir(dentry, &list);
 	if (err)
 		ret = ERR_PTR(err);
-	else if (type == OVL_PATH_MERGE)
-		ret = ovl_clear_empty(dentry, &list);
+	else {
+		/*
+		 * If no upperdentry then skip clearing whiteouts.
+		 *
+		 * Can race with copy-up, since we don't hold the upperdir
+		 * mutex.  Doesn't matter, since copy-up can't create a
+		 * non-empty directory from an empty one.
+		 */
+		if (ovl_dentry_upper(dentry))
+			ret = ovl_clear_empty(dentry, &list);
+	}
  
 	ovl_cache_free(&list);
  
@@ -487,8 +495,7 @@
 	return err;
 }
  
-static int ovl_remove_and_whiteout(struct dentry *dentry,
-				   enum ovl_path_type type, bool is_dir)
+static int ovl_remove_and_whiteout(struct dentry *dentry, bool is_dir)
 {
 	struct dentry *workdir = ovl_workdir(dentry);
 	struct inode *wdir = workdir->d_inode;
@@ -500,7 +507,7 @@
 	int err;
  
 	if (is_dir) {
-		opaquedir = ovl_check_empty_and_clear(dentry, type);
+		opaquedir = ovl_check_empty_and_clear(dentry);
 		err = PTR_ERR(opaquedir);
 		if (IS_ERR(opaquedir))
 			goto out;
  
@@ -515,9 +522,10 @@
 	if (IS_ERR(whiteout))
 		goto out_unlock;
  
-	if (type == OVL_PATH_LOWER) {
+	upper = ovl_dentry_upper(dentry);
+	if (!upper) {
 		upper = lookup_one_len(dentry->d_name.name, upperdir,
-					   dentry->d_name.len);
+				       dentry->d_name.len);
 		err = PTR_ERR(upper);
 		if (IS_ERR(upper))
 			goto kill_whiteout;
@@ -529,7 +537,6 @@
 	} else {
 		int flags = 0;
  
-		upper = ovl_dentry_upper(dentry);
 		if (opaquedir)
 			upper = opaquedir;
 		err = -ESTALE;
@@ -648,7 +655,7 @@
 		cap_raise(override_cred->cap_effective, CAP_CHOWN);
 		old_cred = override_creds(override_cred);
  
-		err = ovl_remove_and_whiteout(dentry, type, is_dir);
+		err = ovl_remove_and_whiteout(dentry, is_dir);
  
 		revert_creds(old_cred);
 		put_cred(override_cred);
@@ -781,7 +788,7 @@
 	}
  
 	if (overwrite && (new_type == OVL_PATH_LOWER || new_type == OVL_PATH_MERGE) && new_is_dir) {
-		opaquedir = ovl_check_empty_and_clear(new, new_type);
+		opaquedir = ovl_check_empty_and_clear(new);
 		err = PTR_ERR(opaquedir);
 		if (IS_ERR(opaquedir)) {
 			opaquedir = NULL;
@@ -235,26 +235,36 @@
 	return err;
 }
  
+static bool ovl_need_xattr_filter(struct dentry *dentry,
+				  enum ovl_path_type type)
+{
+	return type == OVL_PATH_UPPER && S_ISDIR(dentry->d_inode->i_mode);
+}
+
 ssize_t ovl_getxattr(struct dentry *dentry, const char *name,
 		     void *value, size_t size)
 {
-	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
-	    ovl_is_private_xattr(name))
+	struct path realpath;
+	enum ovl_path_type type = ovl_path_real(dentry, &realpath);
+
+	if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
 		return -ENODATA;
  
-	return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
+	return vfs_getxattr(realpath.dentry, name, value, size);
 }
  
 ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
 {
+	struct path realpath;
+	enum ovl_path_type type = ovl_path_real(dentry, &realpath);
 	ssize_t res;
 	int off;
  
-	res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
+	res = vfs_listxattr(realpath.dentry, list, size);
 	if (res <= 0 || size == 0)
 		return res;
  
-	if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
+	if (!ovl_need_xattr_filter(dentry, type))
 		return res;
  
 	/* filter out private xattrs */
  
  
@@ -279,17 +289,16 @@
 {
 	int err;
 	struct path realpath;
-	enum ovl_path_type type;
+	enum ovl_path_type type = ovl_path_real(dentry, &realpath);
  
 	err = ovl_want_write(dentry);
 	if (err)
 		goto out;
  
-	if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
-	    ovl_is_private_xattr(name))
+	err = -ENODATA;
+	if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
 		goto out_drop_write;
  
-	type = ovl_path_real(dentry, &realpath);
 	if (type == OVL_PATH_LOWER) {
 		err = vfs_getxattr(realpath.dentry, name, NULL, 0);
 		if (err < 0)
@@ -274,11 +274,11 @@
 	return 0;
 }
  
-static inline int ovl_dir_read_merged(struct path *upperpath,
-				      struct path *lowerpath,
-				      struct list_head *list)
+static int ovl_dir_read_merged(struct dentry *dentry, struct list_head *list)
 {
 	int err;
+	struct path lowerpath;
+	struct path upperpath;
 	struct ovl_readdir_data rdd = {
 		.ctx.actor = ovl_fill_merge,
 		.list = list,
  
  
  
@@ -286,25 +286,28 @@
 		.is_merge = false,
 	};
  
-	if (upperpath->dentry) {
-		err = ovl_dir_read(upperpath, &rdd);
+	ovl_path_lower(dentry, &lowerpath);
+	ovl_path_upper(dentry, &upperpath);
+
+	if (upperpath.dentry) {
+		err = ovl_dir_read(&upperpath, &rdd);
 		if (err)
 			goto out;
  
-		if (lowerpath->dentry) {
-			err = ovl_dir_mark_whiteouts(upperpath->dentry, &rdd);
+		if (lowerpath.dentry) {
+			err = ovl_dir_mark_whiteouts(upperpath.dentry, &rdd);
 			if (err)
 				goto out;
 		}
 	}
-	if (lowerpath->dentry) {
+	if (lowerpath.dentry) {
 		/*
 		 * Insert lowerpath entries before upperpath ones, this allows
 		 * offsets to be reasonably constant
 		 */
 		list_add(&rdd.middle, rdd.list);
 		rdd.is_merge = true;
-		err = ovl_dir_read(lowerpath, &rdd);
+		err = ovl_dir_read(&lowerpath, &rdd);
 		list_del(&rdd.middle);
 	}
 out:
@@ -329,8 +332,6 @@
 static struct ovl_dir_cache *ovl_cache_get(struct dentry *dentry)
 {
 	int res;
-	struct path lowerpath;
-	struct path upperpath;
 	struct ovl_dir_cache *cache;
  
 	cache = ovl_dir_cache(dentry);
@@ -347,10 +348,7 @@
 	cache->refcount = 1;
 	INIT_LIST_HEAD(&cache->entries);
  
-	ovl_path_lower(dentry, &lowerpath);
-	ovl_path_upper(dentry, &upperpath);
-
-	res = ovl_dir_read_merged(&upperpath, &lowerpath, &cache->entries);
+	res = ovl_dir_read_merged(dentry, &cache->entries);
 	if (res) {
 		ovl_cache_free(&cache->entries);
 		kfree(cache);
  
@@ -452,10 +450,10 @@
 	/*
 	 * Need to check if we started out being a lower dir, but got copied up
 	 */
-	if (!od->is_upper && ovl_path_type(dentry) == OVL_PATH_MERGE) {
+	if (!od->is_upper && ovl_path_type(dentry) != OVL_PATH_LOWER) {
 		struct inode *inode = file_inode(file);
  
-		realfile =lockless_dereference(od->upperfile);
+		realfile = lockless_dereference(od->upperfile);
 		if (!realfile) {
 			struct path upperpath;
  
  
@@ -538,14 +536,9 @@
 int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)
 {
 	int err;
-	struct path lowerpath;
-	struct path upperpath;
 	struct ovl_cache_entry *p;
  
-	ovl_path_upper(dentry, &upperpath);
-	ovl_path_lower(dentry, &lowerpath);
-
-	err = ovl_dir_read_merged(&upperpath, &lowerpath, list);
+	err = ovl_dir_read_merged(dentry, list);
 	if (err)
 		return err;
  
@@ -24,7 +24,7 @@
 MODULE_DESCRIPTION("Overlay filesystem");
 MODULE_LICENSE("GPL");
  
-#define OVERLAYFS_SUPER_MAGIC 0x794c764f
+#define OVERLAYFS_SUPER_MAGIC 0x794c7630
  
 struct ovl_config {
 	char *lowerdir;
@@ -84,12 +84,7 @@
  
 static struct dentry *ovl_upperdentry_dereference(struct ovl_entry *oe)
 {
-	struct dentry *upperdentry = ACCESS_ONCE(oe->__upperdentry);
-	/*
-	 * Make sure to order reads to upperdentry wrt ovl_dentry_update()
-	 */
-	smp_read_barrier_depends();
-	return upperdentry;
+	return lockless_dereference(oe->__upperdentry);
 }
  
 void ovl_path_upper(struct dentry *dentry, struct path *path)
  
@@ -462,11 +457,34 @@
 	{OPT_ERR,			NULL}
 };
  
+static char *ovl_next_opt(char **s)
+{
+	char *sbegin = *s;
+	char *p;
+
+	if (sbegin == NULL)
+		return NULL;
+
+	for (p = sbegin; *p; p++) {
+		if (*p == '\\') {
+			p++;
+			if (!*p)
+				break;
+		} else if (*p == ',') {
+			*p = '\0';
+			*s = p + 1;
+			return sbegin;
+		}
+	}
+	*s = NULL;
+	return sbegin;
+}
+
 static int ovl_parse_opt(char *opt, struct ovl_config *config)
 {
 	char *p;
  
-	while ((p = strsep(&opt, ",")) != NULL) {
+	while ((p = ovl_next_opt(&opt)) != NULL) {
 		int token;
 		substring_t args[MAX_OPT_ARGS];
  
  
  
  
  
@@ -554,15 +572,34 @@
 	goto out_unlock;
 }
  
+static void ovl_unescape(char *s)
+{
+	char *d = s;
+
+	for (;; s++, d++) {
+		if (*s == '\\')
+			s++;
+		*d = *s;
+		if (!*s)
+			break;
+	}
+}
+
 static int ovl_mount_dir(const char *name, struct path *path)
 {
 	int err;
+	char *tmp = kstrdup(name, GFP_KERNEL);
  
-	err = kern_path(name, LOOKUP_FOLLOW, path);
+	if (!tmp)
+		return -ENOMEM;
+
+	ovl_unescape(tmp);
+	err = kern_path(tmp, LOOKUP_FOLLOW, path);
 	if (err) {
-		pr_err("overlayfs: failed to resolve '%s': %i\n", name, err);
+		pr_err("overlayfs: failed to resolve '%s': %i\n", tmp, err);
 		err = -EINVAL;
 	}
+	kfree(tmp);
 	return err;
 }
  
  
@@ -776,11 +813,11 @@
  
 static struct file_system_type ovl_fs_type = {
 	.owner		= THIS_MODULE,
-	.name		= "overlayfs",
+	.name		= "overlay",
 	.mount		= ovl_mount,
 	.kill_sb	= kill_anon_super,
 };
-MODULE_ALIAS_FS("overlayfs");
+MODULE_ALIAS_FS("overlay");
  
 static int __init ovl_init(void)
 {
...	...	@@ -64,7 +64,7 @@
64	64	At mount time, the two directories given as mount options "lowerdir" and
65	65	"upperdir" are combined into a merged directory:
66	66
67		- mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\
	67	+ mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\
68	68	workdir=/work /merged
69	69
70	70	The "workdir" needs to be an empty directory on the same filesystem
...	...	@@ -6888,11 +6888,12 @@
6888	6888	F: include/scsi/osd_*
6889	6889	F: fs/exofs/
6890	6890
6891		-OVERLAYFS FILESYSTEM
	6891	+OVERLAY FILESYSTEM
6892	6892	M: Miklos Szeredi <miklos@szeredi.hu>
6893		-L: linux-fsdevel@vger.kernel.org
	6893	+L: linux-unionfs@vger.kernel.org
	6894	+T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
6894	6895	S: Supported
6895		-F: fs/overlayfs/*
	6896	+F: fs/overlayfs/
6896	6897	F: Documentation/filesystems/overlayfs.txt
6897	6898
6898	6899	P54 WIRELESS DRIVER
...	...	@@ -104,7 +104,7 @@
104	104	obj-$(CONFIG_AUTOFS4_FS) += autofs4/
105	105	obj-$(CONFIG_ADFS_FS) += adfs/
106	106	obj-$(CONFIG_FUSE_FS) += fuse/
107		-obj-$(CONFIG_OVERLAYFS_FS) += overlayfs/
	107	+obj-$(CONFIG_OVERLAY_FS) += overlayfs/
108	108	obj-$(CONFIG_UDF_FS) += udf/
109	109	obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/
110	110	obj-$(CONFIG_OMFS_FS) += omfs/
...	...	@@ -778,6 +778,7 @@
778	778	struct dentry *parent = lock_parent(dentry);
779	779	if (likely(!dentry->d_lockref.count)) {
780	780	__dentry_kill(dentry);
	781	+ dput(parent);
781	782	goto restart;
782	783	}
783	784	if (parent)
...	...	@@ -174,27 +174,6 @@
174	174	* Compute the hash for the isofs name corresponding to the dentry.
175	175	*/
176	176	static int
177		-isofs_hash_common(struct qstr *qstr, int ms)
178		-{
179		- const char *name;
180		- int len;
181		-
182		- len = qstr->len;
183		- name = qstr->name;
184		- if (ms) {
185		- while (len && name[len-1] == '.')
186		- len--;
187		- }
188		-
189		- qstr->hash = full_name_hash(name, len);
190		-
191		- return 0;
192		-}
193		-
194		-/*
195		- * Compute the hash for the isofs name corresponding to the dentry.
196		- */
197		-static int
198	177	isofs_hashi_common(struct qstr *qstr, int ms)
199	178	{
200	179	const char *name;
...	...	@@ -263,6 +242,27 @@
263	242	}
264	243
265	244	#ifdef CONFIG_JOLIET
	245	+/*
	246	+ * Compute the hash for the isofs name corresponding to the dentry.
	247	+ */
	248	+static int
	249	+isofs_hash_common(struct qstr *qstr, int ms)
	250	+{
	251	+ const char *name;
	252	+ int len;
	253	+
	254	+ len = qstr->len;
	255	+ name = qstr->name;
	256	+ if (ms) {
	257	+ while (len && name[len-1] == '.')
	258	+ len--;
	259	+ }
	260	+
	261	+ qstr->hash = full_name_hash(name, len);
	262	+
	263	+ return 0;
	264	+}
	265	+
266	266	static int
267	267	isofs_hash_ms(const struct dentry dentry, struct qstr qstr)
268	268	{
1		-config OVERLAYFS_FS
	1	+config OVERLAY_FS
2	2	tristate "Overlay filesystem support"
3	3	help
4	4	An overlay filesystem combines two filesystems - an 'upper' filesystem
...	...	@@ -2,7 +2,7 @@
2	2	# Makefile for the overlay filesystem.
3	3	#
4	4
5		-obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
	5	+obj-$(CONFIG_OVERLAY_FS) += overlay.o
6	6
7		-overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
	7	+overlay-objs := super.o inode.o dir.o readdir.o copy_up.o
...	...	@@ -284,8 +284,7 @@
284	284	return ERR_PTR(err);
285	285	}
286	286
287		-static struct dentry ovl_check_empty_and_clear(struct dentry dentry,
288		- enum ovl_path_type type)
	287	+static struct dentry ovl_check_empty_and_clear(struct dentry dentry)
289	288	{
290	289	int err;
291	290	struct dentry *ret = NULL;
...	...	@@ -294,8 +293,17 @@
294	293	err = ovl_check_empty_dir(dentry, &list);
295	294	if (err)
296	295	ret = ERR_PTR(err);
297		- else if (type == OVL_PATH_MERGE)
298		- ret = ovl_clear_empty(dentry, &list);
	296	+ else {
	297	+ /*
	298	+ * If no upperdentry then skip clearing whiteouts.
	299	+ *
	300	+ * Can race with copy-up, since we don't hold the upperdir
	301	+ * mutex. Doesn't matter, since copy-up can't create a
	302	+ * non-empty directory from an empty one.
	303	+ */
	304	+ if (ovl_dentry_upper(dentry))
	305	+ ret = ovl_clear_empty(dentry, &list);
	306	+ }
299	307
300	308	ovl_cache_free(&list);
301	309
...	...	@@ -487,8 +495,7 @@
487	495	return err;
488	496	}
489	497
490		-static int ovl_remove_and_whiteout(struct dentry *dentry,
491		- enum ovl_path_type type, bool is_dir)
	498	+static int ovl_remove_and_whiteout(struct dentry *dentry, bool is_dir)
492	499	{
493	500	struct dentry *workdir = ovl_workdir(dentry);
494	501	struct inode *wdir = workdir->d_inode;
...	...	@@ -500,7 +507,7 @@
500	507	int err;
501	508
502	509	if (is_dir) {
503		- opaquedir = ovl_check_empty_and_clear(dentry, type);
	510	+ opaquedir = ovl_check_empty_and_clear(dentry);
504	511	err = PTR_ERR(opaquedir);
505	512	if (IS_ERR(opaquedir))
506	513	goto out;
507	514
...	...	@@ -515,9 +522,10 @@
515	522	if (IS_ERR(whiteout))
516	523	goto out_unlock;
517	524
518		- if (type == OVL_PATH_LOWER) {
	525	+ upper = ovl_dentry_upper(dentry);
	526	+ if (!upper) {
519	527	upper = lookup_one_len(dentry->d_name.name, upperdir,
520		- dentry->d_name.len);
	528	+ dentry->d_name.len);
521	529	err = PTR_ERR(upper);
522	530	if (IS_ERR(upper))
523	531	goto kill_whiteout;
...	...	@@ -529,7 +537,6 @@
529	537	} else {
530	538	int flags = 0;
531	539
532		- upper = ovl_dentry_upper(dentry);
533	540	if (opaquedir)
534	541	upper = opaquedir;
535	542	err = -ESTALE;
...	...	@@ -648,7 +655,7 @@
648	655	cap_raise(override_cred->cap_effective, CAP_CHOWN);
649	656	old_cred = override_creds(override_cred);
650	657
651		- err = ovl_remove_and_whiteout(dentry, type, is_dir);
	658	+ err = ovl_remove_and_whiteout(dentry, is_dir);
652	659
653	660	revert_creds(old_cred);
654	661	put_cred(override_cred);
...	...	@@ -781,7 +788,7 @@
781	788	}
782	789
783	790	if (overwrite && (new_type == OVL_PATH_LOWER \|\| new_type == OVL_PATH_MERGE) && new_is_dir) {
784		- opaquedir = ovl_check_empty_and_clear(new, new_type);
	791	+ opaquedir = ovl_check_empty_and_clear(new);
785	792	err = PTR_ERR(opaquedir);
786	793	if (IS_ERR(opaquedir)) {
787	794	opaquedir = NULL;
...	...	@@ -235,26 +235,36 @@
235	235	return err;
236	236	}
237	237
	238	+static bool ovl_need_xattr_filter(struct dentry *dentry,
	239	+ enum ovl_path_type type)
	240	+{
	241	+ return type == OVL_PATH_UPPER && S_ISDIR(dentry->d_inode->i_mode);
	242	+}
	243	+
238	244	ssize_t ovl_getxattr(struct dentry dentry, const char name,
239	245	void *value, size_t size)
240	246	{
241		- if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
242		- ovl_is_private_xattr(name))
	247	+ struct path realpath;
	248	+ enum ovl_path_type type = ovl_path_real(dentry, &realpath);
	249	+
	250	+ if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
243	251	return -ENODATA;
244	252
245		- return vfs_getxattr(ovl_dentry_real(dentry), name, value, size);
	253	+ return vfs_getxattr(realpath.dentry, name, value, size);
246	254	}
247	255
248	256	ssize_t ovl_listxattr(struct dentry dentry, char list, size_t size)
249	257	{
	258	+ struct path realpath;
	259	+ enum ovl_path_type type = ovl_path_real(dentry, &realpath);
250	260	ssize_t res;
251	261	int off;
252	262
253		- res = vfs_listxattr(ovl_dentry_real(dentry), list, size);
	263	+ res = vfs_listxattr(realpath.dentry, list, size);
254	264	if (res <= 0 \|\| size == 0)
255	265	return res;
256	266
257		- if (ovl_path_type(dentry->d_parent) != OVL_PATH_MERGE)
	267	+ if (!ovl_need_xattr_filter(dentry, type))
258	268	return res;
259	269
260	270	/* filter out private xattrs */
261	271
262	272
...	...	@@ -279,17 +289,16 @@
279	289	{
280	290	int err;
281	291	struct path realpath;
282		- enum ovl_path_type type;
	292	+ enum ovl_path_type type = ovl_path_real(dentry, &realpath);
283	293
284	294	err = ovl_want_write(dentry);
285	295	if (err)
286	296	goto out;
287	297
288		- if (ovl_path_type(dentry->d_parent) == OVL_PATH_MERGE &&
289		- ovl_is_private_xattr(name))
	298	+ err = -ENODATA;
	299	+ if (ovl_need_xattr_filter(dentry, type) && ovl_is_private_xattr(name))
290	300	goto out_drop_write;
291	301
292		- type = ovl_path_real(dentry, &realpath);
293	302	if (type == OVL_PATH_LOWER) {
294	303	err = vfs_getxattr(realpath.dentry, name, NULL, 0);
295	304	if (err < 0)
...	...	@@ -274,11 +274,11 @@
274	274	return 0;
275	275	}
276	276
277		-static inline int ovl_dir_read_merged(struct path *upperpath,
278		- struct path *lowerpath,
279		- struct list_head *list)
	277	+static int ovl_dir_read_merged(struct dentry dentry, struct list_head list)
280	278	{
281	279	int err;
	280	+ struct path lowerpath;
	281	+ struct path upperpath;
282	282	struct ovl_readdir_data rdd = {
283	283	.ctx.actor = ovl_fill_merge,
284	284	.list = list,
285	285
286	286
287	287
...	...	@@ -286,25 +286,28 @@
286	286	.is_merge = false,
287	287	};
288	288
289		- if (upperpath->dentry) {
290		- err = ovl_dir_read(upperpath, &rdd);
	289	+ ovl_path_lower(dentry, &lowerpath);
	290	+ ovl_path_upper(dentry, &upperpath);
	291	+
	292	+ if (upperpath.dentry) {
	293	+ err = ovl_dir_read(&upperpath, &rdd);
291	294	if (err)
292	295	goto out;
293	296
294		- if (lowerpath->dentry) {
295		- err = ovl_dir_mark_whiteouts(upperpath->dentry, &rdd);
	297	+ if (lowerpath.dentry) {
	298	+ err = ovl_dir_mark_whiteouts(upperpath.dentry, &rdd);
296	299	if (err)
297	300	goto out;
298	301	}
299	302	}
300		- if (lowerpath->dentry) {
	303	+ if (lowerpath.dentry) {
301	304	/*
302	305	* Insert lowerpath entries before upperpath ones, this allows
303	306	* offsets to be reasonably constant
304	307	*/
305	308	list_add(&rdd.middle, rdd.list);
306	309	rdd.is_merge = true;
307		- err = ovl_dir_read(lowerpath, &rdd);
	310	+ err = ovl_dir_read(&lowerpath, &rdd);
308	311	list_del(&rdd.middle);
309	312	}
310	313	out:
...	...	@@ -329,8 +332,6 @@
329	332	static struct ovl_dir_cache ovl_cache_get(struct dentry dentry)
330	333	{
331	334	int res;
332		- struct path lowerpath;
333		- struct path upperpath;
334	335	struct ovl_dir_cache *cache;
335	336
336	337	cache = ovl_dir_cache(dentry);
...	...	@@ -347,10 +348,7 @@
347	348	cache->refcount = 1;
348	349	INIT_LIST_HEAD(&cache->entries);
349	350
350		- ovl_path_lower(dentry, &lowerpath);
351		- ovl_path_upper(dentry, &upperpath);
352		-
353		- res = ovl_dir_read_merged(&upperpath, &lowerpath, &cache->entries);
	351	+ res = ovl_dir_read_merged(dentry, &cache->entries);
354	352	if (res) {
355	353	ovl_cache_free(&cache->entries);
356	354	kfree(cache);
357	355
...	...	@@ -452,10 +450,10 @@
452	450	/*
453	451	* Need to check if we started out being a lower dir, but got copied up
454	452	*/
455		- if (!od->is_upper && ovl_path_type(dentry) == OVL_PATH_MERGE) {
	453	+ if (!od->is_upper && ovl_path_type(dentry) != OVL_PATH_LOWER) {
456	454	struct inode *inode = file_inode(file);
457	455
458		- realfile =lockless_dereference(od->upperfile);
	456	+ realfile = lockless_dereference(od->upperfile);
459	457	if (!realfile) {
460	458	struct path upperpath;
461	459
462	460
...	...	@@ -538,14 +536,9 @@
538	536	int ovl_check_empty_dir(struct dentry dentry, struct list_head list)
539	537	{
540	538	int err;
541		- struct path lowerpath;
542		- struct path upperpath;
543	539	struct ovl_cache_entry *p;
544	540
545		- ovl_path_upper(dentry, &upperpath);
546		- ovl_path_lower(dentry, &lowerpath);
547		-
548		- err = ovl_dir_read_merged(&upperpath, &lowerpath, list);
	541	+ err = ovl_dir_read_merged(dentry, list);
549	542	if (err)
550	543	return err;
551	544