Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~shefty/rdma-dev.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 034d985032296cd4dfbc80e4d6717ac8b4ea77c4..859ba2dd88903ba207c7b0e448e0f5ce7f99e46e 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -678,7 +678,7 @@ next_slot:
                                                disk_bytenr, num_bytes, 0,
                                                root->root_key.objectid,
                                                new_key.objectid,
                                                disk_bytenr, num_bytes, 0,
                                                root->root_key.objectid,
                                                new_key.objectid,

-                                               start - extent_offset);
+                                               start - extent_offset, 0);

                                BUG_ON(ret);
                                *hint_byte = disk_bytenr;
                        }
                                BUG_ON(ret);
                                *hint_byte = disk_bytenr;
                        }


@@ -753,7 +753,7 @@ next_slot:
                                                disk_bytenr, num_bytes, 0,
                                                root->root_key.objectid,
                                                key.objectid, key.offset -
                                                disk_bytenr, num_bytes, 0,
                                                root->root_key.objectid,
                                                key.objectid, key.offset -

-                                               extent_offset);
+                                               extent_offset, 0);

                                BUG_ON(ret);
                                inode_sub_bytes(inode,
                                                extent_end - key.offset);
                                BUG_ON(ret);
                                inode_sub_bytes(inode,
                                                extent_end - key.offset);


@@ -962,7 +962,7 @@ again:
 
                ret = btrfs_inc_extent_ref(trans, root, bytenr, num_bytes, 0,
                                           root->root_key.objectid,
 
                ret = btrfs_inc_extent_ref(trans, root, bytenr, num_bytes, 0,
                                           root->root_key.objectid,

-                                          ino, orig_offset);
+                                          ino, orig_offset, 0);

                BUG_ON(ret);
 
                if (split == start) {
                BUG_ON(ret);
 
                if (split == start) {


@@ -989,7 +989,7 @@ again:
                del_nr++;
                ret = btrfs_free_extent(trans, root, bytenr, num_bytes,
                                        0, root->root_key.objectid,
                del_nr++;
                ret = btrfs_free_extent(trans, root, bytenr, num_bytes,
                                        0, root->root_key.objectid,

-                                       ino, orig_offset);
+                                       ino, orig_offset, 0);

                BUG_ON(ret);
        }
        other_start = 0;
                BUG_ON(ret);
        }
        other_start = 0;


@@ -1006,7 +1006,7 @@ again:
                del_nr++;
                ret = btrfs_free_extent(trans, root, bytenr, num_bytes,
                                        0, root->root_key.objectid,
                del_nr++;
                ret = btrfs_free_extent(trans, root, bytenr, num_bytes,
                                        0, root->root_key.objectid,

-                                       ino, orig_offset);
+                                       ino, orig_offset, 0);

                BUG_ON(ret);
        }
        if (del_nr == 0) {
                BUG_ON(ret);
        }
        if (del_nr == 0) {


@@ -1274,7 +1274,6 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                                                   dirty_pages);
                if (dirty_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
                        btrfs_btree_balance_dirty(root, 1);
                                                   dirty_pages);
                if (dirty_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
                        btrfs_btree_balance_dirty(root, 1);

-               btrfs_throttle(root);

 
                pos += copied;
                num_written += copied;
 
                pos += copied;
                num_written += copied;