GIT: unionfs2-2.6.27.y: Unionfs: interpose cleanup and fix for spliced dentries

[Erez Zadok]

commit 65d92e96d9e0d1976ceabac828bc64f3d1669e2e
Author: Erez Zadok <ezk at cs.sunysb.edu>
Date:   Thu Dec 20 22:40:38 2007 -0500

    Unionfs: interpose cleanup and fix for spliced dentries
    
    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 at fsl.cs.sunysb.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 22aa6e6..ea8976d 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -149,9 +149,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
@@ -169,6 +167,12 @@ skip:
 				unionfs_fill_inode(dentry, inode);
 			}
 			goto out_spliced;
+		} else if (!spliced) {
+			if (need_fill_inode) {
+				need_fill_inode = 0;
+				unionfs_fill_inode(dentry, inode);
+				goto out_spliced;
+			}
 		}
 		break;
 	case INTERPOSE_REVAL: