From 54e6646674f02c1d8edd8e445703f47a8c1d7f2e Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 20 Sep 2006 15:48:09 -0400
Subject: [PATCH] --- yaml --- r: 38864 b: refs/heads/master c:
 56965536b8056f57830219efbba4b85218d96d6c h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/gfs2/incore.h      | 3 ---
 trunk/fs/gfs2/meta_io.c     | 6 +-----
 trunk/fs/gfs2/ops_address.c | 4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1ee76e6c941b..622238ab755b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0e522a901f209d55992a20f4e30123b43af37dd
+refs/heads/master: 56965536b8056f57830219efbba4b85218d96d6c
diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
index 89df68b32fc6..7183dcf03563 100644
--- a/trunk/fs/gfs2/incore.h
+++ b/trunk/fs/gfs2/incore.h
@@ -12,9 +12,6 @@
 
 #include <linux/fs.h>
 
-#define DIO_FORCE	0x00000001
-#define DIO_CLEAN	0x00000002
-#define DIO_DIRTY	0x00000004
 #define DIO_START	0x00000008
 #define DIO_WAIT	0x00000010
 #define DIO_METADATA	0x00000020
diff --git a/trunk/fs/gfs2/meta_io.c b/trunk/fs/gfs2/meta_io.c
index a5630ec6c045..6b52aacb0736 100644
--- a/trunk/fs/gfs2/meta_io.c
+++ b/trunk/fs/gfs2/meta_io.c
@@ -120,8 +120,7 @@ void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
 					gfs2_io_error_bh(sdp, bh);
 					gfs2_log_lock(sdp);
 				}
-				list_move(&bd->bd_ail_st_list,
-					  &ai->ai_ail2_list);
+				list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list);
 				continue;
 			}
 
@@ -411,9 +410,6 @@ int gfs2_meta_reread(struct gfs2_sbd *sdp, struct buffer_head *bh, int flags)
 	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
 		return -EIO;
 
-	if (flags & DIO_FORCE)
-		clear_buffer_uptodate(bh);
-
 	if ((flags & DIO_START) && !buffer_uptodate(bh))
 		ll_rw_block(READ, 1, &bh);
 
diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c
index 91ec8080eeb2..3f9da7ce5dd9 100644
--- a/trunk/fs/gfs2/ops_address.c
+++ b/trunk/fs/gfs2/ops_address.c
@@ -65,7 +65,7 @@ static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
 int gfs2_get_block(struct inode *inode, sector_t lblock,
 	           struct buffer_head *bh_result, int create)
 {
-	return gfs2_block_map(inode, lblock, create, bh_result, 32);
+	return gfs2_block_map(inode, lblock, create, bh_result, 4);
 }
 
 /**
@@ -94,7 +94,7 @@ static int gfs2_get_block_noalloc(struct inode *inode, sector_t lblock,
 static int gfs2_get_block_direct(struct inode *inode, sector_t lblock,
 				 struct buffer_head *bh_result, int create)
 {
-	return gfs2_block_map(inode, lblock, 0, bh_result, 512);
+	return gfs2_block_map(inode, lblock, 0, bh_result, 32);
 }
 
 /**