From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 28 Jul 2006 18:52:33 +0000 (-0400)
Subject: [GFS2] Fix bug in clear_inode
X-Git-Tag: v2.6.19-rc1~32^2~118
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5dd9feafb351a8bf304292623cbc63335c34d279;p=linux-2.6-omap-h63xx.git

[GFS2] Fix bug in clear_inode

We should have been waiting for lock demotion to finish in
clear_inode.

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

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 91ac9c9d4a9..b6edf7c0923 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -771,6 +771,7 @@ void gfs2_glock_inode_squish(struct inode *inode)
 	list_add_tail(&gh.gh_list, &gl->gl_waiters2);
 	run_queue(gl);
 	spin_unlock(&gl->gl_spin);
+	wait_for_completion(&gh.gh_wait);
 	gfs2_holder_uninit(&gh);
 }