aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2011-01-31 09:38:12 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2011-01-31 09:38:12 +0000
commitedae38a6431276c50d4b51543c36de258722358e (patch)
tree4b6628f405c8563d08c21a71587d25135cd74147
parent75d5cfbe4b78cc26af7b042e23f61700b50bc294 (diff)
downloadkernel_samsung_smdk4412-edae38a6431276c50d4b51543c36de258722358e.tar.gz
kernel_samsung_smdk4412-edae38a6431276c50d4b51543c36de258722358e.tar.bz2
kernel_samsung_smdk4412-edae38a6431276c50d4b51543c36de258722358e.zip
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>
-rw-r--r--fs/gfs2/glock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index c75d4998519..ddc3e1e3faa 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);