Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c673ab3 authored by Al Viro's avatar Al Viro
Browse files

simplify gfs2_lookup() 



d_splice_alias() will DTRT when given NULL or ERR_PTR

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 79ac5a46

fs/gfs2/inode.c

+3 −11
Original line number Original line Diff line number Diff line
@@ -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;

}

}





/**

/**