From 37eaedc31e948d2bbc916a0a22415193c54df612 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Fri, 25 Nov 2005 16:41:57 +1100
Subject: [PATCH] --- yaml --- r: 14687 b: refs/heads/master c:
 a4656391b76ed93faed724c5963f033164ee477e h: refs/heads/master i:   14685:
 dd0c93e0ebb2ded1e201494ef920903f038d584c   14683:
 42498282f530080c92e45775c93b130e17cbeab5   14679:
 daf38acfd3f17d3befdf9243907caf1a8ad7b35b   14671:
 e1f1da95587f61652e25580e3956e526948db6c5   14655:
 5bb6e3ef36060e63b9d1e333d926a8d203811639 v: v3

---
 [refs]                            |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_aops.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d986eaa4a0ad..ffcf0e841178 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f33c6797bccc695c4c85885f2c676ad4c8fed98d
+refs/heads/master: a4656391b76ed93faed724c5963f033164ee477e
diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
index c6108971b4e6..94d3cdfbf9b8 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_aops.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -941,13 +941,12 @@ __linvfs_get_block(
 	int			retpbbm = 1;
 	int			error;
 
-	if (blocks) {
-		offset = blocks << inode->i_blkbits;	/* 64 bit goodness */
-		size = (ssize_t) min_t(xfs_off_t, offset, LONG_MAX);
-	} else {
-		size = 1 << inode->i_blkbits;
-	}
 	offset = (xfs_off_t)iblock << inode->i_blkbits;
+	if (blocks)
+		size = (ssize_t) min_t(xfs_off_t, LONG_MAX,
+					(xfs_off_t)blocks << inode->i_blkbits);
+	else
+		size = 1 << inode->i_blkbits;
 
 	VOP_BMAP(vp, offset, size,
 		create ? flags : BMAPI_READ, &iomap, &retpbbm, error);
@@ -1007,7 +1006,7 @@ __linvfs_get_block(
 		ASSERT(iomap.iomap_bsize - iomap.iomap_delta > 0);
 		offset = min_t(xfs_off_t,
 				iomap.iomap_bsize - iomap.iomap_delta,
-				blocks << inode->i_blkbits);
+				(xfs_off_t)blocks << inode->i_blkbits);
 		bh_result->b_size = (u32) min_t(xfs_off_t, UINT_MAX, offset);
 	}