From 2608dff78203e68aac269e87f8d49b99eece2bc9 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 31 Jan 2011 09:38:12 +0000
Subject: [PATCH] --- yaml --- r: 235054 b: refs/heads/master c:
 edae38a6431276c50d4b51543c36de258722358e h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/glock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index efc98b278bf2..b5813073b277 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75d5cfbe4b78cc26af7b042e23f61700b50bc294
+refs/heads/master: edae38a6431276c50d4b51543c36de258722358e
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index c75d4998519e..ddc3e1e3faaf 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -972,13 +972,13 @@ __acquires(&gl->gl_spin)
 			insert_pt = &gh2->gh_list;
 	}
 	set_bit(GLF_QUEUED, &gl->gl_flags);
+	trace_gfs2_glock_queue(gh, 1);
 	if (likely(insert_pt == NULL)) {
 		list_add_tail(&gh->gh_list, &gl->gl_holders);
 		if (unlikely(gh->gh_flags & LM_FLAG_PRIORITY))
 			goto do_cancel;
 		return;
 	}
-	trace_gfs2_glock_queue(gh, 1);
 	list_add_tail(&gh->gh_list, insert_pt);
 do_cancel:
 	gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list);