From 4d156cc661fba154dee585222ba55e28ea2146f0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 17 Jul 2011 10:22:27 -0400 Subject: [PATCH] --- yaml --- r: 257401 b: refs/heads/master c: 6c673ab393bc18e8bff729cd04cf384d15e72a04 h: refs/heads/master i: 257399: a6c7d90c32c077915dbf3f6a5080d4e788ae67a4 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/inode.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index fe9871fb7385..331da05315da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79ac5a46c5c1c17476fbf84b4d4600d6d565defd +refs/heads/master: 6c673ab393bc18e8bff729cd04cf384d15e72a04 diff --git a/trunk/fs/gfs2/inode.c b/trunk/fs/gfs2/inode.c index b1090d66a6fd..0fb51a96eff0 100644 --- a/trunk/fs/gfs2/inode.c +++ b/trunk/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); } /**