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/ext3/namei.c | |
| parent | 0c1aa9a952c3608eb17bf990466f1491d1ee8b6c (diff) | |
| download | op-kernel-dev-a9049376ee05bf966bfe2b081b5071326856890a.zip op-kernel-dev-a9049376ee05bf966bfe2b081b5071326856890a.tar.gz | |
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/ext3/namei.c')
| -rw-r--r-- | fs/ext3/namei.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 34b6d9b..c095cf5 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c @@ -1038,15 +1038,11 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str return ERR_PTR(-EIO); } inode = ext3_iget(dir->i_sb, ino); - if (IS_ERR(inode)) { - if (PTR_ERR(inode) == -ESTALE) { - ext3_error(dir->i_sb, __func__, - "deleted inode referenced: %lu", - ino); - return ERR_PTR(-EIO); - } else { - return ERR_CAST(inode); - } + if (inode == ERR_PTR(-ESTALE)) { + ext3_error(dir->i_sb, __func__, + "deleted inode referenced: %lu", + ino); + return ERR_PTR(-EIO); } } return d_splice_alias(inode, dentry); |
