diff --git a/[refs] b/[refs]
index 47e83a4ef8c1..2c01f091fed6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed98b56a6393c5e150fd5095b9eb7fd7d3cfb041
+refs/heads/master: 9ba4611a3a7902c6bad70c5c205de5161fcfc17b
diff --git a/trunk/fs/btrfs/ordered-data.h b/trunk/fs/btrfs/ordered-data.h
index 36e63f1f79b3..199cb0b4f1d9 100644
--- a/trunk/fs/btrfs/ordered-data.h
+++ b/trunk/fs/btrfs/ordered-data.h
@@ -95,7 +95,8 @@ struct btrfs_ordered_extent {
  * calculates the total size you need to allocate for an ordered sum
  * structure spanning 'bytes' in the file
  */
-static inline int btrfs_ordered_sum_size(struct btrfs_root *root, u64 bytes)
+static inline int btrfs_ordered_sum_size(struct btrfs_root *root,
+					 unsigned long bytes)
 {
 	unsigned long num_sectors = (bytes + root->sectorsize - 1) /
 		root->sectorsize;