diff options
-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 @@ | |||
17 | #include <linux/writeback.h> | 17 | #include <linux/writeback.h> |
18 | #include <linux/swap.h> | 18 | #include <linux/swap.h> |
19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
20 | #include <linux/bio.h> | ||
20 | #include <linux/gfs2_ondisk.h> | 21 | #include <linux/gfs2_ondisk.h> |
21 | #include <linux/lm_interface.h> | 22 | #include <linux/lm_interface.h> |
22 | 23 | ||
@@ -385,7 +386,7 @@ int gfs2_meta_read(struct gfs2_glock *gl, u64 blkno, int flags, | |||
385 | { | 386 | { |
386 | *bhp = getbuf(gl->gl_sbd, gl->gl_aspace, blkno, CREATE); | 387 | *bhp = getbuf(gl->gl_sbd, gl->gl_aspace, blkno, CREATE); |
387 | if (!buffer_uptodate(*bhp)) | 388 | if (!buffer_uptodate(*bhp)) |
388 | ll_rw_block(READ, 1, bhp); | 389 | ll_rw_block(READ_META, 1, bhp); |
389 | if (flags & DIO_WAIT) { | 390 | if (flags & DIO_WAIT) { |
390 | int error = gfs2_meta_wait(gl->gl_sbd, *bhp); | 391 | int error = gfs2_meta_wait(gl->gl_sbd, *bhp); |
391 | if (error) { | 392 | if (error) { |
@@ -659,7 +660,7 @@ int gfs2_meta_indirect_buffer(struct gfs2_inode *ip, int height, u64 num, | |||
659 | } else { | 660 | } else { |
660 | u32 mtype = height ? GFS2_METATYPE_IN : GFS2_METATYPE_DI; | 661 | u32 mtype = height ? GFS2_METATYPE_IN : GFS2_METATYPE_DI; |
661 | if (!buffer_uptodate(bh)) { | 662 | if (!buffer_uptodate(bh)) { |
662 | ll_rw_block(READ, 1, &bh); | 663 | ll_rw_block(READ_META, 1, &bh); |
663 | if (gfs2_meta_wait(sdp, bh)) | 664 | if (gfs2_meta_wait(sdp, bh)) |
664 | goto err; | 665 | goto err; |
665 | } | 666 | } |
@@ -712,7 +713,7 @@ struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen) | |||
712 | if (buffer_uptodate(first_bh)) | 713 | if (buffer_uptodate(first_bh)) |
713 | goto out; | 714 | goto out; |
714 | if (!buffer_locked(first_bh)) | 715 | if (!buffer_locked(first_bh)) |
715 | ll_rw_block(READ, 1, &first_bh); | 716 | ll_rw_block(READ_META, 1, &first_bh); |
716 | 717 | ||
717 | dblock++; | 718 | dblock++; |
718 | extlen--; | 719 | 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 @@ | |||
43 | #include <linux/buffer_head.h> | 43 | #include <linux/buffer_head.h> |
44 | #include <linux/sort.h> | 44 | #include <linux/sort.h> |
45 | #include <linux/fs.h> | 45 | #include <linux/fs.h> |
46 | #include <linux/bio.h> | ||
46 | #include <linux/gfs2_ondisk.h> | 47 | #include <linux/gfs2_ondisk.h> |
47 | #include <linux/lm_interface.h> | 48 | #include <linux/lm_interface.h> |
48 | 49 | ||
@@ -609,7 +610,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, | |||
609 | set_buffer_uptodate(bh); | 610 | set_buffer_uptodate(bh); |
610 | 611 | ||
611 | if (!buffer_uptodate(bh)) { | 612 | if (!buffer_uptodate(bh)) { |
612 | ll_rw_block(READ, 1, &bh); | 613 | ll_rw_block(READ_META, 1, &bh); |
613 | wait_on_buffer(bh); | 614 | wait_on_buffer(bh); |
614 | if (!buffer_uptodate(bh)) | 615 | if (!buffer_uptodate(bh)) |
615 | goto unlock; | 616 | goto unlock; |