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/jfs | |
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/jfs')
-rw-r--r-- | fs/jfs/namei.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c index 1da0dc799286..247331551992 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c | |||
@@ -1481,10 +1481,8 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, struc | |||
1481 | } | 1481 | } |
1482 | 1482 | ||
1483 | ip = jfs_iget(dip->i_sb, inum); | 1483 | ip = jfs_iget(dip->i_sb, inum); |
1484 | if (IS_ERR(ip)) { | 1484 | if (IS_ERR(ip)) |
1485 | jfs_err("jfs_lookup: iget failed on inum %d", (uint) inum); | 1485 | jfs_err("jfs_lookup: iget failed on inum %d", (uint) inum); |
1486 | return ERR_CAST(ip); | ||
1487 | } | ||
1488 | 1486 | ||
1489 | return d_splice_alias(ip, dentry); | 1487 | return d_splice_alias(ip, dentry); |
1490 | } | 1488 | } |