aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2011-06-18 20:26:38 +0000
committerChris Mason <chris.mason@oracle.com>2011-06-25 09:31:06 -0400
commite0f5406727f1dfdc47b8ba4a0ff6eae4b0b5ed4c (patch)
tree85c481aae5bb4998b832e15b2e62a4987a76127b
parent1973f0faeb4a5f35597793c65d3c94d8fd386e10 (diff)
downloadkernel_samsung_smdk4412-e0f5406727f1dfdc47b8ba4a0ff6eae4b0b5ed4c.tar.gz
kernel_samsung_smdk4412-e0f5406727f1dfdc47b8ba4a0ff6eae4b0b5ed4c.tar.bz2
kernel_samsung_smdk4412-e0f5406727f1dfdc47b8ba4a0ff6eae4b0b5ed4c.zip
Btrfs: fix type mismatch in find_free_extent()
data parameter should be u64 because a full-sized chunk flags field is passed instead of 0/1 for distinguishing data from metadata. All underlying functions expect u64. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/extent-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1f61bf5b496..71cd456fdb6 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4842,7 +4842,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
u64 num_bytes, u64 empty_size,
u64 search_start, u64 search_end,
u64 hint_byte, struct btrfs_key *ins,
- int data)
+ u64 data)
{
int ret = 0;
struct btrfs_root *root = orig_root->fs_info->extent_root;
@@ -4869,7 +4869,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans,
space_info = __find_space_info(root->fs_info, data);
if (!space_info) {
- printk(KERN_ERR "No space info for %d\n", data);
+ printk(KERN_ERR "No space info for %llu\n", data);
return -ENOSPC;
}