From 6525dac71e4ede5f2f14c15f04967e96ef0dd6ca Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Thu, 10 Jan 2008 06:53:30 -0500 Subject: [PATCH] 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 Signed-off-by: Erez Zadok --- fs/unionfs/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c index 63161aef22..9371c2ef68 100644 --- a/fs/unionfs/main.c +++ b/fs/unionfs/main.c @@ -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 -- 2.34.1