From 7a25b949ca8de707ee6249cb63fdcebfb6a94d8a Mon Sep 17 00:00:00 2001
From: Utako Kusaka <u-kusaka@wm.jp.nec.com>
Date: Wed, 27 Jul 2011 22:11:20 -0400
Subject: [PATCH] --- yaml --- r: 262130 b: refs/heads/master c:
 29ae07b702cb77dbc24b0843f15ee8cf8a642311 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/extents.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff7698c4f19b..8824cba40743 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e1147b001793593624e80b3c0a1790822b6baca
+refs/heads/master: 29ae07b702cb77dbc24b0843f15ee8cf8a642311
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index a25bbdc7d493..57cf568a98ab 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -3824,7 +3824,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
 						blkbits) >> blkbits))
 			new_size = offset + len;
 		else
-			new_size = (map.m_lblk + ret) << blkbits;
+			new_size = ((loff_t) map.m_lblk + ret) << blkbits;
 
 		ext4_falloc_update_inode(inode, mode, new_size,
 					 (map.m_flags & EXT4_MAP_NEW));