Unionfs: interpose cleanup and fix for spliced dentries
authorErez Zadok <ezk@cs.sunysb.edu>
Thu, 10 Jan 2008 11:53:30 +0000 (06:53 -0500)
committerRachita Kothiyal <rachita@dewey.fsl.cs.sunysb.edu>
Thu, 1 May 2008 23:03:28 +0000 (19:03 -0400)
Fix unionfs_interpose to fill lower inode info when d_splice_alias returns
NULL.  Also cleanup impossible case (d_splice_alias doesn't return ERR_PTR).

Signed-off-by: Rachita Kothiyal <rachita@fsl.cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
fs/unionfs/main.c

index 63161aef22d82e2216ebcfe158579758d0999202..9371c2ef680a226f508d796a5be17ed0f922c387 100644 (file)
@@ -173,9 +173,7 @@ skip:
                break;
        case INTERPOSE_LOOKUP:
                spliced = d_splice_alias(inode, dentry);
-               if (IS_ERR(spliced)) {
-                       err = PTR_ERR(spliced);
-               } else if (spliced && spliced != dentry) {
+               if (spliced && spliced != dentry) {
                        /*
                         * d_splice can return a dentry if it was
                         * disconnected and had to be moved.  We must ensure