aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2011-01-31 04:38:12 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2011-01-31 04:38:12 -0500
commitedae38a6431276c50d4b51543c36de258722358e (patch)
tree4b6628f405c8563d08c21a71587d25135cd74147
parent75d5cfbe4b78cc26af7b042e23f61700b50bc294 (diff)
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 c75d4998519e..ddc3e1e3faaf 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -972,13 +972,13 @@ fail:
972 insert_pt = &gh2->gh_list; 972 insert_pt = &gh2->gh_list;
973 } 973 }
974 set_bit(GLF_QUEUED, &gl->gl_flags); 974 set_bit(GLF_QUEUED, &gl->gl_flags);
975 trace_gfs2_glock_queue(gh, 1);
975 if (likely(insert_pt == NULL)) { 976 if (likely(insert_pt == NULL)) {
976 list_add_tail(&gh->gh_list, &gl->gl_holders); 977 list_add_tail(&gh->gh_list, &gl->gl_holders);
977 if (unlikely(gh->gh_flags & LM_FLAG_PRIORITY)) 978 if (unlikely(gh->gh_flags & LM_FLAG_PRIORITY))
978 goto do_cancel; 979 goto do_cancel;
979 return; 980 return;
980 } 981 }
981 trace_gfs2_glock_queue(gh, 1);
982 list_add_tail(&gh->gh_list, insert_pt); 982 list_add_tail(&gh->gh_list, insert_pt);
983do_cancel: 983do_cancel:
984 gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list); 984 gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list);