From 870689a97060a8a7aa5e1e5b456775a33eb76ff8 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 2 Oct 2006 11:38:25 -0400
Subject: [PATCH] --- yaml --- r: 38881 b: refs/heads/master c:
 2e565bb69ce2184eabf4f43e64afc79c46f46204 h: refs/heads/master i:   38879:
 8f6212851c020286162de000a10259b3bdfbb40a v: v3

---
 [refs]                  | 2 +-
 trunk/fs/gfs2/meta_io.c | 7 ++++---
 trunk/fs/gfs2/quota.c   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index aa632a29c81b..9915447404d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128e5ebaf8abbda375bba82690b09630003c9213
+refs/heads/master: 2e565bb69ce2184eabf4f43e64afc79c46f46204
diff --git a/trunk/fs/gfs2/meta_io.c b/trunk/fs/gfs2/meta_io.c
index 731799153187..d0d981dac4cd 100644
--- a/trunk/fs/gfs2/meta_io.c
+++ b/trunk/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/trunk/fs/gfs2/quota.c b/trunk/fs/gfs2/quota.c
index c0a3c9a2a593..c69b94a55588 100644
--- a/trunk/fs/gfs2/quota.c
+++ b/trunk/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;