From 1e027e9c8ad22a878e6661eaa24047d1d74a90c8 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Fri, 31 May 2013 19:38:56 -0400
Subject: [PATCH] --- yaml --- r: 377579 b: refs/heads/master c:
 a60697f411eb365fb09e639e6f183fe33d1eb796 h: refs/heads/master i:   377577:
 e0280f3c9da1e213e0818152909f7661b46c30c6   377575:
 93e9800fa53bd9c4c178150aedc7303c36f73b38 v: v3

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

diff --git a/[refs] b/[refs]
index 9ddad9f8f26b..8c901e268000 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7293fd146846e2a44d29e0477e0860c60fb856b
+refs/heads/master: a60697f411eb365fb09e639e6f183fe33d1eb796
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 214e68a5e79f..299ee9df546f 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -4679,7 +4679,7 @@ static int ext4_xattr_fiemap(struct inode *inode,
 		error = ext4_get_inode_loc(inode, &iloc);
 		if (error)
 			return error;
-		physical = iloc.bh->b_blocknr << blockbits;
+		physical = (__u64)iloc.bh->b_blocknr << blockbits;
 		offset = EXT4_GOOD_OLD_INODE_SIZE +
 				EXT4_I(inode)->i_extra_isize;
 		physical += offset;
@@ -4687,7 +4687,7 @@ static int ext4_xattr_fiemap(struct inode *inode,
 		flags |= FIEMAP_EXTENT_DATA_INLINE;
 		brelse(iloc.bh);
 	} else { /* external block */
-		physical = EXT4_I(inode)->i_file_acl << blockbits;
+		physical = (__u64)EXT4_I(inode)->i_file_acl << blockbits;
 		length = inode->i_sb->s_blocksize;
 	}