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

Commit 7bd9ee58 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Check for glock already held in gfs2_getxattr 



Since the introduction of atomic_open, gfs2_getxattr can be
called with the glock already held, so we need to allow for
this.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Reported-by: default avatarDavid Teigland <teigland@redhat.com>
Tested-by: default avatarDavid Teigland <teigland@redhat.com>
parent dfc4616d

fs/gfs2/inode.c

+4 −0
Original line number Diff line number Diff line
@@ -1750,6 +1750,10 @@ static ssize_t gfs2_getxattr(struct dentry *dentry, const char *name, 
	struct gfs2_holder gh;

	int ret;



	/* For selinux during lookup */

	if (gfs2_glock_is_locked_by_me(ip->i_gl))

		return generic_getxattr(dentry, name, data, size);



	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &gh);

	ret = gfs2_glock_nq(&gh);

	if (ret == 0) {