From 6de971c989227917057e82e2512c11e1340f1902 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Wed, 23 Jul 2008 09:26:26 -0400
Subject: [PATCH] --- yaml --- r: 128842 b: refs/heads/master c:
 9ba4611a3a7902c6bad70c5c205de5161fcfc17b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/btrfs/ordered-data.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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;