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 3fe48658d4340cd81e396587372b82098629276a..f48209f62c5ed685b9256919b2b20175fa944383 100644 (file)
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -505,13 +505,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);