Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify gfs2_lookup()

Browse Source 
d_splice_alias() will DTRT when given NULL or ERR_PTR

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-07-17 10:22:27 -04:00
parent 79ac5a46c5
commit 6c673ab393
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/gfs2/inode.c
View File

@ -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, static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
struct nameidata *nd) struct nameidata *nd)
{ {
struct inode *inode = NULL; struct inode *inode = gfs2_lookupi(dir, &dentry->d_name, 0);
if (inode && !IS_ERR(inode)) {
inode = gfs2_lookupi(dir, &dentry->d_name, 0);
if (inode && IS_ERR(inode))
return ERR_CAST(inode);
if (inode) {
struct gfs2_glock *gl = GFS2_I(inode)->i_gl; struct gfs2_glock *gl = GFS2_I(inode)->i_gl;
struct gfs2_holder gh; struct gfs2_holder gh;
int error; int error;
@ -808,11 +803,8 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry,
return ERR_PTR(error); return ERR_PTR(error);
} }
gfs2_glock_dq_uninit(&gh); gfs2_glock_dq_uninit(&gh);
return d_splice_alias(inode, dentry);
} }
d_add(dentry, inode); return d_splice_alias(inode, dentry);
return NULL;
} }
/** /**