From 9801f6461eb994e4eda29cba97f4596dffafbf32 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Fri, 12 May 2006 14:06:02 -0400 Subject: [PATCH] [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 --- fs/gfs2/inode.c | 1 - fs/gfs2/ops_fstype.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 0817f6ede188..5522fa747297 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -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); diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index f252723b37da..44c64effc964 100644 --- a/fs/gfs2/ops_fstype.c +++ b/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); 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) { -- 2.34.1