From 3b7ea549915d54146c4861a816d8ed4de972ec12 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 12 May 2006 14:06:02 -0400
Subject: [PATCH] --- yaml --- r: 38687 b: refs/heads/master c:
 9801f6461eb994e4eda29cba97f4596dffafbf32 h: refs/heads/master i:   38685:
 13946acb0471fd26400be46588100cacea0431c9   38683:
 d183ef46ae39ef917c52cac3f4661abdf31b9062   38679:
 d5ce4eb3570332cc87580477e9a618c455c72ca6   38671:
 9b99f83621a9fadaa0f15b9234ac96fdb25a83f1   38655:
 7b8362b686c6a3a184389ece79fe97e0ecfdaf4d v: v3

---
 [refs]                     | 2 +-
 trunk/fs/gfs2/inode.c      | 1 -
 trunk/fs/gfs2/ops_fstype.c | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9f342117f321..e8e0288be863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e90c01e148b967d30caf59e76accb3a58ca6b74b
+refs/heads/master: 9801f6461eb994e4eda29cba97f4596dffafbf32
diff --git a/trunk/fs/gfs2/inode.c b/trunk/fs/gfs2/inode.c
index 0817f6ede188..5522fa747297 100644
--- a/trunk/fs/gfs2/inode.c
+++ b/trunk/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/trunk/fs/gfs2/ops_fstype.c b/trunk/fs/gfs2/ops_fstype.c
index f252723b37da..44c64effc964 100644
--- a/trunk/fs/gfs2/ops_fstype.c
+++ b/trunk/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) {