commit | a9049376ee05bf966bfe2b081b5071326856890a | [log] [tgz] |
---|---|---|
author | Al Viro <viro@zeniv.linux.org.uk> | Fri Jul 08 21:20:11 2011 -0400 |
committer | Al Viro <viro@zeniv.linux.org.uk> | Wed Jul 20 01:44:26 2011 -0400 |
tree | efb3cbfc7760537f201bb28dacbb0d39ec39f04c | |
parent | 0c1aa9a952c3608eb17bf990466f1491d1ee8b6c [diff] [blame] |
make d_splice_alias(ERR_PTR(err), dentry) = ERR_PTR(err) ... and simplify the living hell out of callers Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/dcache.c b/fs/dcache.c index c61edd03..41e2085 100644 --- a/fs/dcache.c +++ b/fs/dcache.c
@@ -1652,6 +1652,9 @@ { struct dentry *new = NULL; + if (IS_ERR(inode)) + return ERR_CAST(inode); + if (inode && S_ISDIR(inode->i_mode)) { spin_lock(&inode->i_lock); new = __d_find_alias(inode, 1);