diff --git a/[refs] b/[refs]
index b5462f7098cb..1173fef4e9c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 566370a2e56837be98bc62d012fc2d2d11851db4
+refs/heads/master: eaf3793728d07d995f1e74250b2d0005f7ae98b5
diff --git a/trunk/fs/ext4/inline.c b/trunk/fs/ext4/inline.c
index 3e2bf873e8a8..33331b4c2178 100644
--- a/trunk/fs/ext4/inline.c
+++ b/trunk/fs/ext4/inline.c
@@ -1842,7 +1842,7 @@ int ext4_inline_data_fiemap(struct inode *inode,
 	if (error)
 		goto out;
 
-	physical = iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits;
+	physical = (__u64)iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits;
 	physical += (char *)ext4_raw_inode(&iloc) - iloc.bh->b_data;
 	physical += offsetof(struct ext4_inode, i_block);
 	length = i_size_read(inode);