From: Amir Goldstein <amir73il@gmail.com>
Date: Mon, 24 Apr 2017 19:26:40 +0000 (+0300)
Subject: ovl: do not set overlay.opaque on non-dir create
X-Git-Tag: Ubuntu-4.10.0-25.29~30
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=82d2d6f9ae22a9de631b46005d7c53f297a4113b;p=mirror_ubuntu-zesty-kernel.git

ovl: do not set overlay.opaque on non-dir create

BugLink: http://bugs.launchpad.net/bugs/1692898

commit 4a99f3c83dc493c8ea84693d78cd792839c8aa64 upstream.

The optimization for opaque dir create was wrongly being applied
also to non-dir create.

Fixes: 97c684cc9110 ("ovl: create directories inside merged parent opaque")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 16e06dd89457..2e1f16d22c16 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -209,7 +209,7 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
 	if (err)
 		goto out_dput;
 
-	if (ovl_type_merge(dentry->d_parent)) {
+	if (ovl_type_merge(dentry->d_parent) && d_is_dir(newdentry)) {
 		/* Setting opaque here is just an optimization, allow to fail */
 		ovl_set_opaque(dentry, newdentry);
 	}