Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 6f030c299de817a11b19ebb15965eee9082aac62..4439fbb4ff451bbad4fa03f864ec5ed1ae8625be 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2127,17 +2127,13 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
        ins.type = BTRFS_EXTENT_ITEM_KEY;
        ret = btrfs_alloc_reserved_file_extent(trans, root,
                                        root->root_key.objectid,
-                                       btrfs_ino(inode), file_pos, &ins);
-       if (ret < 0)
-               goto out;
+                                       btrfs_ino(inode), file_pos,
+                                       ram_bytes, &ins);
        /*
-        * Release the reserved range from inode dirty range map, and
-        * move it to delayed ref codes, as now accounting only happens at
-        * commit_transaction() time.
+        * Release the reserved range from inode dirty range map, as it is
+        * already moved into delayed_ref_head
         */
        btrfs_qgroup_release_data(inode, file_pos, ram_bytes);
-       ret = btrfs_add_delayed_qgroup_reserve(root->fs_info, trans,
-                       root->objectid, disk_bytenr, ram_bytes);
 out:
        btrfs_free_path(path);