summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/relocation.c
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-04-13 12:54:33 -0400
committerJosef Bacik <josef@redhat.com>2011-05-23 13:00:56 -0400
commit7a7eaa40a39bde4eefc91aadeb1ce3dc4e6a1252 (patch)
treeeea3dea572a73168b70efa9fba2e9800457571d7 /fs/btrfs/relocation.c
parent74b2107543da4ed9607ec484f63c42362dc9fca6 (diff)
Btrfs: take away the num_items argument from btrfs_join_transaction
I keep forgetting that btrfs_join_transaction() just ignores the num_items argument, which leads me to sending pointless patches and looking stupid :). So just kill the num_items argument from btrfs_join_transaction and btrfs_start_ioctl_transaction, since neither of them use it. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/relocation.c')
-rw-r--r--fs/btrfs/relocation.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 199a80134312..8bb256667f2d 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2149,7 +2149,7 @@ again:
2149 err = ret; 2149 err = ret;
2150 } 2150 }
2151 2151
2152 trans = btrfs_join_transaction(rc->extent_root, 1); 2152 trans = btrfs_join_transaction(rc->extent_root);
2153 if (IS_ERR(trans)) { 2153 if (IS_ERR(trans)) {
2154 if (!err) 2154 if (!err)
2155 btrfs_block_rsv_release(rc->extent_root, 2155 btrfs_block_rsv_release(rc->extent_root,
@@ -3233,7 +3233,7 @@ truncate:
3233 goto out; 3233 goto out;
3234 } 3234 }
3235 3235
3236 trans = btrfs_join_transaction(root, 0); 3236 trans = btrfs_join_transaction(root);
3237 if (IS_ERR(trans)) { 3237 if (IS_ERR(trans)) {
3238 btrfs_free_path(path); 3238 btrfs_free_path(path);
3239 ret = PTR_ERR(trans); 3239 ret = PTR_ERR(trans);
@@ -3642,7 +3642,7 @@ int prepare_to_relocate(struct reloc_control *rc)
3642 rc->create_reloc_tree = 1; 3642 rc->create_reloc_tree = 1;
3643 set_reloc_control(rc); 3643 set_reloc_control(rc);
3644 3644
3645 trans = btrfs_join_transaction(rc->extent_root, 1); 3645 trans = btrfs_join_transaction(rc->extent_root);
3646 BUG_ON(IS_ERR(trans)); 3646 BUG_ON(IS_ERR(trans));
3647 btrfs_commit_transaction(trans, rc->extent_root); 3647 btrfs_commit_transaction(trans, rc->extent_root);
3648 return 0; 3648 return 0;
@@ -3831,7 +3831,7 @@ restart:
3831 btrfs_block_rsv_release(rc->extent_root, rc->block_rsv, (u64)-1); 3831 btrfs_block_rsv_release(rc->extent_root, rc->block_rsv, (u64)-1);
3832 3832
3833 /* get rid of pinned extents */ 3833 /* get rid of pinned extents */
3834 trans = btrfs_join_transaction(rc->extent_root, 1); 3834 trans = btrfs_join_transaction(rc->extent_root);
3835 if (IS_ERR(trans)) 3835 if (IS_ERR(trans))
3836 err = PTR_ERR(trans); 3836 err = PTR_ERR(trans);
3837 else 3837 else
@@ -4156,7 +4156,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
4156 4156
4157 set_reloc_control(rc); 4157 set_reloc_control(rc);
4158 4158
4159 trans = btrfs_join_transaction(rc->extent_root, 1); 4159 trans = btrfs_join_transaction(rc->extent_root);
4160 if (IS_ERR(trans)) { 4160 if (IS_ERR(trans)) {
4161 unset_reloc_control(rc); 4161 unset_reloc_control(rc);
4162 err = PTR_ERR(trans); 4162 err = PTR_ERR(trans);
@@ -4190,7 +4190,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
4190 4190
4191 unset_reloc_control(rc); 4191 unset_reloc_control(rc);
4192 4192
4193 trans = btrfs_join_transaction(rc->extent_root, 1); 4193 trans = btrfs_join_transaction(rc->extent_root);
4194 if (IS_ERR(trans)) 4194 if (IS_ERR(trans))
4195 err = PTR_ERR(trans); 4195 err = PTR_ERR(trans);
4196 else 4196 else