From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Fri, 25 Jan 2008 02:57:06 +0000 (-0500)
Subject: Unionfs: remove unnecessary call to d_iput
X-Git-Tag: unionfs-2.2.3~3
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=8dc06b17b0cbb82de3cc07d154a555b51f2c92ac;p=unionfs-2.6.39.y.git

Unionfs: remove unnecessary call to d_iput

This old code was to fix a bug which has long since been fixed in our
copyup_permission and unionfs_d_iput.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index 16b2c7c0306..8663224c153 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -807,19 +807,6 @@ begin:
 						 lower_dentry);
 		unlock_dir(lower_parent_dentry);
 		if (err) {
-			struct inode *inode = lower_dentry->d_inode;
-			/*
-			 * If we get here, it means that we created a new
-			 * dentry+inode, but copying permissions failed.
-			 * Therefore, we should delete this inode and dput
-			 * the dentry so as not to leave cruft behind.
-			 */
-			if (lower_dentry->d_op && lower_dentry->d_op->d_iput)
-				lower_dentry->d_op->d_iput(lower_dentry,
-							   inode);
-			else
-				iput(inode);
-			lower_dentry->d_inode = NULL;
 			dput(lower_dentry);
 			lower_dentry = ERR_PTR(err);
 			goto out;