From ba61e93f8c55a4efb514b8fdf0c8bdddcc9259c4 Mon Sep 17 00:00:00 2001
From: Jeff Moyer <jmoyer@redhat.com>
Date: Thu, 9 Sep 2010 16:37:33 -0700
Subject: [PATCH] --- yaml --- r: 210445 b: refs/heads/master c:
 7a801ac6f5067539ceb5fad0fe90ec49fc156e47 h: refs/heads/master i:   210443:
 0d1fec1ea58661f54144b80d5663ca3d0437db0e v: v3

---
 [refs]               | 2 +-
 trunk/fs/direct-io.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1a393c7a42be..18a6d1858b52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e70598c3b56e6fec551454c495d4d4025834749
+refs/heads/master: 7a801ac6f5067539ceb5fad0fe90ec49fc156e47
diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c
index 51f270b479b6..48d74c7391d1 100644
--- a/trunk/fs/direct-io.c
+++ b/trunk/fs/direct-io.c
@@ -634,7 +634,7 @@ static int dio_send_cur_page(struct dio *dio)
 	int ret = 0;
 
 	if (dio->bio) {
-		loff_t cur_offset = dio->block_in_file << dio->blkbits;
+		loff_t cur_offset = dio->cur_page_fs_offset;
 		loff_t bio_next_offset = dio->logical_offset_in_bio +
 			dio->bio->bi_size;
 
@@ -659,7 +659,7 @@ static int dio_send_cur_page(struct dio *dio)
 		 * Submit now if the underlying fs is about to perform a
 		 * metadata read
 		 */
-		if (dio->boundary)
+		else if (dio->boundary)
 			dio_bio_submit(dio);
 	}