From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 12 May 2006 18:06:02 +0000 (-0400)
Subject: [GFS2] Remove incorrect initialisation of gh_owner
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9801f6461eb994e4eda29cba97f4596dffafbf32;p=linux.git

[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>
---

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 0817f6ede1888..5522fa747297b 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 f252723b37da1..44c64effc964d 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) {