diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
| commit | 9785dbdf265ddc47d5c88267d89a97648c0dc14b (patch) | |
| tree | 3a97a48d6f282f9e06c5446beeb886fcd86c4798 /fs/btrfs/file.c | |
| parent | d756bd2d9339447c29bde950910586df8f8941ec (diff) | |
| parent | 6bf7e080d5bcb0d399ee38ce3dabbfad64448192 (diff) | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 97fbe939c050..fc97b00bd871 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
| @@ -678,7 +678,7 @@ next_slot: | |||
| 678 | disk_bytenr, num_bytes, 0, | 678 | disk_bytenr, num_bytes, 0, |
| 679 | root->root_key.objectid, | 679 | root->root_key.objectid, |
| 680 | new_key.objectid, | 680 | new_key.objectid, |
| 681 | start - extent_offset); | 681 | start - extent_offset, 0); |
| 682 | BUG_ON(ret); | 682 | BUG_ON(ret); |
| 683 | *hint_byte = disk_bytenr; | 683 | *hint_byte = disk_bytenr; |
| 684 | } | 684 | } |
| @@ -753,7 +753,7 @@ next_slot: | |||
| 753 | disk_bytenr, num_bytes, 0, | 753 | disk_bytenr, num_bytes, 0, |
| 754 | root->root_key.objectid, | 754 | root->root_key.objectid, |
| 755 | key.objectid, key.offset - | 755 | key.objectid, key.offset - |
| 756 | extent_offset); | 756 | extent_offset, 0); |
| 757 | BUG_ON(ret); | 757 | BUG_ON(ret); |
| 758 | inode_sub_bytes(inode, | 758 | inode_sub_bytes(inode, |
| 759 | extent_end - key.offset); | 759 | extent_end - key.offset); |
| @@ -962,7 +962,7 @@ again: | |||
| 962 | 962 | ||
| 963 | ret = btrfs_inc_extent_ref(trans, root, bytenr, num_bytes, 0, | 963 | ret = btrfs_inc_extent_ref(trans, root, bytenr, num_bytes, 0, |
| 964 | root->root_key.objectid, | 964 | root->root_key.objectid, |
| 965 | ino, orig_offset); | 965 | ino, orig_offset, 0); |
| 966 | BUG_ON(ret); | 966 | BUG_ON(ret); |
| 967 | 967 | ||
| 968 | if (split == start) { | 968 | if (split == start) { |
| @@ -989,7 +989,7 @@ again: | |||
| 989 | del_nr++; | 989 | del_nr++; |
| 990 | ret = btrfs_free_extent(trans, root, bytenr, num_bytes, | 990 | ret = btrfs_free_extent(trans, root, bytenr, num_bytes, |
| 991 | 0, root->root_key.objectid, | 991 | 0, root->root_key.objectid, |
| 992 | ino, orig_offset); | 992 | ino, orig_offset, 0); |
| 993 | BUG_ON(ret); | 993 | BUG_ON(ret); |
| 994 | } | 994 | } |
| 995 | other_start = 0; | 995 | other_start = 0; |
| @@ -1006,7 +1006,7 @@ again: | |||
| 1006 | del_nr++; | 1006 | del_nr++; |
| 1007 | ret = btrfs_free_extent(trans, root, bytenr, num_bytes, | 1007 | ret = btrfs_free_extent(trans, root, bytenr, num_bytes, |
| 1008 | 0, root->root_key.objectid, | 1008 | 0, root->root_key.objectid, |
| 1009 | ino, orig_offset); | 1009 | ino, orig_offset, 0); |
| 1010 | BUG_ON(ret); | 1010 | BUG_ON(ret); |
| 1011 | } | 1011 | } |
| 1012 | if (del_nr == 0) { | 1012 | if (del_nr == 0) { |