Unionfs: cleanup state in ->permission before returning ECHILD

Fixes bugs that cased leftover dentries upon unmount, causing oopses.

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 24243adbe61affefabe28b23da35d8a6ece5cea6..3d34394306c649e324103355b47ea3e2dd66a52e 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -794,8 +794,10 @@ static int unionfs_permission(struct inode *inode, int mask, unsigned int flags)
        struct inode *inode_grabbed = igrab(inode);
        struct dentry *dentry = d_find_alias(inode);
 
-       if (flags & IPERM_FLAG_RCU)
-               return -ECHILD;
+       if (flags & IPERM_FLAG_RCU) {
+               err = -ECHILD;
+               goto out_nograb;
+       }
 
        if (dentry)
                unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD);
@@ -892,6 +894,7 @@ out:
                dput(dentry);
        }
        iput(inode_grabbed);
+out_nograb:
        return err;
 }