From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Thu, 10 Jan 2008 11:55:01 +0000 (-0500)
Subject: Unionfs: release special files on copyup
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=1adfd043321e2c40d481ed611f46e9d30e90f413;p=unionfs-odf.git

Unionfs: release special files on copyup

If we copyup a special file (char, block, etc.), then dput the source
object.

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

diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index 4b4dda4cfb..96b3b950dd 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -511,13 +511,12 @@ out_unlock:
 
 out_free:
 	/*
-	 * If old_lower_dentry was a directory, we need to dput it.  If it
-	 * was a file, then it was already dput indirectly by other
+	 * If old_lower_dentry was not a file, then we need to dput it.  If
+	 * it was a file, then it was already dput indirectly by other
 	 * functions we call above which operate on regular files.
 	 */
 	if (old_lower_dentry && old_lower_dentry->d_inode &&
-	    (S_ISDIR(old_lower_dentry->d_inode->i_mode) ||
-	     S_ISLNK(old_lower_dentry->d_inode->i_mode)))
+	    !S_ISREG(old_lower_dentry->d_inode->i_mode))
 		dput(old_lower_dentry);
 	kfree(symbuf);