From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 31 Jan 2011 09:38:12 +0000 (+0000)
Subject: GFS2: Fix glock queue trace point
X-Git-Tag: v2.6.39-rc1~488^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=edae38a6431276c50d4b51543c36de258722358e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

GFS2: Fix glock queue trace point

Somehow this tracepoint landed up in the wrong place. This moves it
to where it should be.

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

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index c75d499..ddc3e1e 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -972,13 +972,13 @@ fail:
 			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);