From: Miklos Szeredi <mszeredi@redhat.com>
Date: Mon, 21 Mar 2016 16:31:46 +0000 (+0100)
Subject: ovl: cleanup unused var in rename2
X-Git-Tag: v4.1.12-108.0.20170806_1300~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8f6be43b5fe08cccae6b17c7c2c76e27d4262876;p=users%2Fjedix%2Flinux-maple.git

ovl: cleanup unused var in rename2

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

Orabug: 26401569

(backport upstream commit 6986c012faa480fb0fda74eaae9abb22f7ad1004)

Signed-off-by: Shan Hai <shan.hai@oracle.com>
Reviewed-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
---

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index f66e7a7d761b..61f2b34726d3 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -730,7 +730,6 @@ static int ovl_rename2(struct inode *olddir, struct dentry *old,
 	struct dentry *trap;
 	bool old_opaque;
 	bool new_opaque;
-	bool new_create = false;
 	bool cleanup_whiteout = false;
 	bool overwrite = !(flags & RENAME_EXCHANGE);
 	bool is_dir = d_is_dir(old);
@@ -863,7 +862,6 @@ static int ovl_rename2(struct inode *olddir, struct dentry *old,
 				goto out_dput;
 		}
 	} else {
-		new_create = true;
 		if (!d_is_negative(newdentry) &&
 		    (!new_opaque || !ovl_is_whiteout(newdentry)))
 			goto out_dput;