diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 09:43:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 09:43:44 -0700 |
| commit | 6cb8a911745616eee0bdd97a2e82eb9723e9599a (patch) | |
| tree | f5a95d10443653009ee0db290657b938c5215695 /fs/gfs2/lops.c | |
| parent | 7f3591cfacf2d79c4f42238e46c7d053da8e020d (diff) | |
| parent | 3ea400581f2b595afd91207bbd79c11cb38598e0 (diff) | |
| download | op-kernel-dev-6cb8a911745616eee0bdd97a2e82eb9723e9599a.zip op-kernel-dev-6cb8a911745616eee0bdd97a2e82eb9723e9599a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
GFS2: Remove lock_kernel from gfs2_put_super()
GFS2: Add tracepoints
Diffstat (limited to 'fs/gfs2/lops.c')
| -rw-r--r-- | fs/gfs2/lops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index 00315f5..9969ff0 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c @@ -27,6 +27,7 @@ #include "rgrp.h" #include "trans.h" #include "util.h" +#include "trace_gfs2.h" /** * gfs2_pin - Pin a buffer in memory @@ -53,6 +54,7 @@ static void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh) if (bd->bd_ail) list_move(&bd->bd_ail_st_list, &bd->bd_ail->ai_ail2_list); get_bh(bh); + trace_gfs2_pin(bd, 1); } /** @@ -89,6 +91,7 @@ static void gfs2_unpin(struct gfs2_sbd *sdp, struct buffer_head *bh, bd->bd_ail = ai; list_add(&bd->bd_ail_st_list, &ai->ai_ail1_list); clear_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags); + trace_gfs2_pin(bd, 0); gfs2_log_unlock(sdp); unlock_buffer(bh); } |
