Unionfs: remove unnecessary call to d_iput
authorErez Zadok <ezk@cs.sunysb.edu>
Fri, 25 Jan 2008 02:57:06 +0000 (21:57 -0500)
committerErez Zadok <ezk@cs.sunysb.edu>
Fri, 29 Apr 2011 02:25:52 +0000 (22:25 -0400)
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>
fs/unionfs/copyup.c

index 16b2c7c0306c03e70b510cdd2d64273d7816f60a..8663224c153d6c5662c842176c57d52c610734ec 100644 (file)
@@ -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;