---

yaml --- r: 377579 b: refs/heads/master c: a60697f h: refs/heads/master i: 377577: e0280f3 377575: 93e9800 v: v3
git-mirror · May 31, 2013 · 1e027e9 · 1e027e9
1 parent 56764cd
commit 1e027e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -4679,15 +4679,15 @@ 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;
 		length = EXT4_SB(inode->i_sb)->s_inode_size - offset;
 		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;
 	}