diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-17 10:22:27 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-20 20:48:02 -0400 |
| commit | 6c673ab393bc18e8bff729cd04cf384d15e72a04 (patch) | |
| tree | e1eed0667626c8b092d27500560808d834d21e8d /fs | |
| parent | 79ac5a46c5c1c17476fbf84b4d4600d6d565defd (diff) | |
| download | linux-3.10-6c673ab393bc18e8bff729cd04cf384d15e72a04.tar.gz linux-3.10-6c673ab393bc18e8bff729cd04cf384d15e72a04.tar.bz2 linux-3.10-6c673ab393bc18e8bff729cd04cf384d15e72a04.zip | |
simplify gfs2_lookup()
d_splice_alias() will DTRT when given NULL or ERR_PTR
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/inode.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index b1090d66a6f..0fb51a96eff 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -792,13 +792,8 @@ static int gfs2_create(struct inode *dir, struct dentry *dentry, static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) { - struct inode *inode = NULL; - - inode = gfs2_lookupi(dir, &dentry->d_name, 0); - if (inode && IS_ERR(inode)) - return ERR_CAST(inode); - - if (inode) { + struct inode *inode = gfs2_lookupi(dir, &dentry->d_name, 0); + if (inode && !IS_ERR(inode)) { struct gfs2_glock *gl = GFS2_I(inode)->i_gl; struct gfs2_holder gh; int error; @@ -808,11 +803,8 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry, return ERR_PTR(error); } gfs2_glock_dq_uninit(&gh); - return d_splice_alias(inode, dentry); } - d_add(dentry, inode); - - return NULL; + return d_splice_alias(inode, dentry); } /** |