From 0406b0ce3cdf175370c1898f9dc86102f32ef8d2 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 25 Dec 2007 17:03:29 -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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c index 22aa6e6b005..ea8976d9b7e 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: -- 2.43.0