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

Commit 9801f646 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Remove incorrect initialisation of gh_owner 



The gh_owner field shouldn't be set or reset outside the glock code.
These were left over from when recursive locking was allowed. It
isn't any more, so they are not needed.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent e90c01e1

fs/gfs2/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ static int inode_create(struct gfs2_glock *i_gl, const struct gfs2_inum *inum, 
		if (error)

			goto fail;

	}

	ip->i_iopen_gh.gh_owner = NULL;



	spin_lock(&io_gl->gl_spin);

	gfs2_glock_hold(i_gl);

fs/gfs2/ops_fstype.c

+0 −5
Original line number Diff line number Diff line
@@ -468,11 +468,6 @@ static int init_journal(struct gfs2_sbd *sdp, int undo) 
	gfs2_glock_dq_uninit(&ji_gh);

	jindex = 0;



	/* Disown my Journal glock */



	sdp->sd_journal_gh.gh_owner = NULL;

	sdp->sd_jinode_gh.gh_owner = NULL;



	p = kthread_run(gfs2_recoverd, sdp, "gfs2_recoverd");

	error = IS_ERR(p);

	if (error) {