diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 11:38:25 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 11:38:25 -0400 |
| commit | 2e565bb69ce2184eabf4f43e64afc79c46f46204 (patch) | |
| tree | 187002dd39d29171c8909aa296992791c0765d79 /fs/gfs2 | |
| parent | 128e5ebaf8abbda375bba82690b09630003c9213 (diff) | |
| download | blackbird-obmc-linux-2e565bb69ce2184eabf4f43e64afc79c46f46204.tar.gz blackbird-obmc-linux-2e565bb69ce2184eabf4f43e64afc79c46f46204.zip | |
[GFS2] Mark metadata reads for blktrace
Mark the metadata reads so that blktrace knows what they are.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/meta_io.c | 7 | ||||
| -rw-r--r-- | fs/gfs2/quota.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 731799153187..d0d981dac4cd 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c @@ -17,6 +17,7 @@ #include <linux/writeback.h> #include <linux/swap.h> #include <linux/delay.h> +#include <linux/bio.h> #include <linux/gfs2_ondisk.h> #include <linux/lm_interface.h> @@ -385,7 +386,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags, { *bhp = getbuf(gl->gl_sbd, gl->gl_aspace, blkno, CREATE); if (!buffer_uptodate(*bhp)) - ll_rw_block(READ, 1, bhp); + ll_rw_block(READ_META, 1, bhp); if (flags & DIO_WAIT) { int error = gfs2_meta_wait(gl->gl_sbd, *bhp); if (error) { @@ -659,7 +660,7 @@ int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num, } else { u32 mtype = height ? GFS2_METATYPE_IN : GFS2_METATYPE_DI; if (!buffer_uptodate(bh)) { - ll_rw_block(READ, 1, &bh); + ll_rw_block(READ_META, 1, &bh); if (gfs2_meta_wait(sdp, bh)) goto err; } @@ -712,7 +713,7 @@ struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen) if (buffer_uptodate(first_bh)) goto out; if (!buffer_locked(first_bh)) - ll_rw_block(READ, 1, &first_bh); + ll_rw_block(READ_META, 1, &first_bh); dblock++; extlen--; diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index c0a3c9a2a593..c69b94a55588 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -43,6 +43,7 @@ #include <linux/buffer_head.h> #include <linux/sort.h> #include <linux/fs.h> +#include <linux/bio.h> #include <linux/gfs2_ondisk.h> #include <linux/lm_interface.h> @@ -609,7 +610,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, set_buffer_uptodate(bh); if (!buffer_uptodate(bh)) { - ll_rw_block(READ, 1, &bh); + ll_rw_block(READ_META, 1, &bh); wait_on_buffer(bh); if (!buffer_uptodate(bh)) goto unlock; |
