diff --git a/[refs] b/[refs]
index b9054fd21900..e95848d80b11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 696b55d768ea5ebf38a369da615f8c956750ab3f
+refs/heads/master: fd8351f83d413b41da956109cf429c15881886e2
diff --git a/trunk/fs/ocfs2/uptodate.c b/trunk/fs/ocfs2/uptodate.c
index 523514020891..187b99ff0368 100644
--- a/trunk/fs/ocfs2/uptodate.c
+++ b/trunk/fs/ocfs2/uptodate.c
@@ -562,7 +562,7 @@ void ocfs2_remove_xattr_clusters_from_cache(struct inode *inode,
 					    sector_t block,
 					    u32 c_len)
 {
-	u64 i, b_len = ocfs2_clusters_to_blocks(inode->i_sb, 1) * c_len;
+	unsigned int i, b_len = ocfs2_clusters_to_blocks(inode->i_sb, 1) * c_len;
 
 	for (i = 0; i < b_len; i++, block++)
 		ocfs2_remove_block_from_cache(inode, block);