diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-08 21:20:11 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 01:44:26 -0400 |
commit | a9049376ee05bf966bfe2b081b5071326856890a (patch) | |
tree | efb3cbfc7760537f201bb28dacbb0d39ec39f04c /fs/ext2/namei.c | |
parent | 0c1aa9a952c3608eb17bf990466f1491d1ee8b6c (diff) |
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>
Diffstat (limited to 'fs/ext2/namei.c')
-rw-r--r-- | fs/ext2/namei.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index ed5c5d496ee9..d60b7099e2db 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c | |||
@@ -67,15 +67,11 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str | |||
67 | inode = NULL; | 67 | inode = NULL; |
68 | if (ino) { | 68 | if (ino) { |
69 | inode = ext2_iget(dir->i_sb, ino); | 69 | inode = ext2_iget(dir->i_sb, ino); |
70 | if (IS_ERR(inode)) { | 70 | if (inode == ERR_PTR(-ESTALE)) { |
71 | if (PTR_ERR(inode) == -ESTALE) { | 71 | ext2_error(dir->i_sb, __func__, |
72 | ext2_error(dir->i_sb, __func__, | 72 | "deleted inode referenced: %lu", |
73 | "deleted inode referenced: %lu", | 73 | (unsigned long) ino); |
74 | (unsigned long) ino); | 74 | return ERR_PTR(-EIO); |
75 | return ERR_PTR(-EIO); | ||
76 | } else { | ||
77 | return ERR_CAST(inode); | ||
78 | } | ||
79 | } | 75 | } |
80 | } | 76 | } |
81 | return d_splice_alias(inode, dentry); | 77 | return d_splice_alias(inode, dentry); |