From mboxrd@z Thu Jan  1 00:00:00 1970
From: swhiteho@redhat.com <swhiteho@redhat.com>
Date: Thu,  4 Oct 2007 09:49:35 +0100
Subject: [Cluster-devel] [PATCH 42/51] [GFS2] Move inode deletion out of
	blocking_cb
In-Reply-To: <1191487864951-git-send-email-swhiteho@redhat.com>
References: <11914877842142-git-send-email-swhiteho@redhat.com>
	<11914877912880-git-send-email-swhiteho@redhat.com>
	<11914877934041-git-send-email-swhiteho@redhat.com>
	<11914877952291-git-send-email-swhiteho@redhat.com>
	<11914877971413-git-send-email-swhiteho@redhat.com>
	<11914877993073-git-send-email-swhiteho@redhat.com>
	<11914878002186-git-send-email-swhiteho@redhat.com>
	<1191487802255-git-send-email-swhiteho@redhat.com>
	<11914878043598-git-send-email-swhiteho@redhat.com>
	<11914878063121-git-send-email-swhiteho@redhat.com>
	<11914878081562-git-send-email-swhiteho@redhat.com>
	<11914878102813-git-send-email-swhiteho@redhat.com>
	<1191487812928-git-send-email-swhiteho@redhat.com>
	<11914878141625-git-send-email-swhiteho@redhat.com>
	<1191487815172-git-send-email-swhiteho@redhat.com>
	<11914878173677-git-send-email-swhiteho@redhat.com>
	<11914878191964-git-send-email-swhiteho@redhat.com>
	<11914878214113-git-send-email-swhiteho@redhat.com>
	<11914878231394-git-send-email-swhiteho@redhat.com>
	<11914878252873-git-send-email-swhiteho@redhat.com>
	<11914878271468-git-send-email-swhiteho@redhat.com>
	<11914878283252-git-send-email-swhiteho@redhat.com>
	<11914878304004-git-send-email-swhiteho@redhat.com>
	<11914878323899-git-send-email-swhiteho@redhat.com>
	<11914878342921-git-send-email-swhiteho@redhat.com>
	<11914878361239-git-send-email-swhiteho@redhat.com>
	<11914878383633-git-send-email-swhiteho@redhat.com>
	<11914878401428-git-send-email-swhiteho@redhat.com>
	<11914878422398-git-send-email-swhiteho@redhat.com>
	<1191487844772-git-send-email-swhiteho@redhat.com>
	<1191487846406-git-send-email-swhiteho@redhat.com>
	<11914878472056-git-send-email-swhiteho@redhat.com>
	<11914878492645-git-send-email-swhiteho@redhat.com>
	<11914878513555-git-send-email-swhiteho@redhat.com>
	<11914878521254-git-send-email-swhiteho@redhat.com>
	<119148785427-git-send-email-swhiteho@redhat.com>
	<11914878551328-git-send-email-swhiteho@redhat.com>
	<11914878571888-git-send-email-swhiteho@redhat.com>
	<11914878592314-git-send-email-swhiteho@redhat.com>
	<1191487861683-git-send-email-swhiteho@redhat.com>
	<11914878632211-git-send-email-swhiteho@redhat.com>
	<1191487864951-git-send-email-swhiteho@redhat.com>
Message-ID: <11914878661743-git-send-email-swhiteho@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

From: Wendy Cheng <wcheng@redhat.com>

Move inode deletion code out of blocking_cb handle_callback route to
avoid racy conditions that end up blocking lock_dlm1 thread. Fix
bugzilla 286821.

Signed-off-by: Wendy Cheng <wcheng@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index d631cad..a37efe4 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -716,12 +716,8 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state,
 		gl->gl_demote_time = jiffies;
 		if (remote && gl->gl_ops->go_type == LM_TYPE_IOPEN &&
 		    gl->gl_object) {
-			struct inode *inode = igrab(gl->gl_object);
+			gfs2_glock_schedule_for_reclaim(gl);
 			spin_unlock(&gl->gl_spin);
-			if (inode) {
-				d_prune_aliases(inode);
-				iput(inode);
-			}
 			return;
 		}
 	} else if (gl->gl_demote_state != LM_ST_UNLOCKED &&
-- 
1.5.1.2