Эх сурвалжийг харах

[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: Steven Whitehouse <swhiteho@redhat.com>
Steven Whitehouse 19 жил өмнө
parent
commit
9801f6461e

+ 0 - 1
fs/gfs2/inode.c

@@ -319,7 +319,6 @@ static int inode_create(struct gfs2_glock *i_gl, const struct gfs2_inum *inum,
 		if (error)
 		if (error)
 			goto fail;
 			goto fail;
 	}
 	}
-	ip->i_iopen_gh.gh_owner = NULL;
 
 
 	spin_lock(&io_gl->gl_spin);
 	spin_lock(&io_gl->gl_spin);
 	gfs2_glock_hold(i_gl);
 	gfs2_glock_hold(i_gl);

+ 0 - 5
fs/gfs2/ops_fstype.c

@@ -468,11 +468,6 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
 	gfs2_glock_dq_uninit(&ji_gh);
 	gfs2_glock_dq_uninit(&ji_gh);
 	jindex = 0;
 	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");
 	p = kthread_run(gfs2_recoverd, sdp, "gfs2_recoverd");
 	error = IS_ERR(p);
 	error = IS_ERR(p);
 	if (error) {
 	if (error) {