diff options
author | Josef Bacik <josef@redhat.com> | 2011-04-13 12:54:33 -0400 |
---|---|---|
committer | Josef Bacik <josef@redhat.com> | 2011-05-23 13:00:56 -0400 |
commit | 7a7eaa40a39bde4eefc91aadeb1ce3dc4e6a1252 (patch) | |
tree | eea3dea572a73168b70efa9fba2e9800457571d7 /fs/btrfs/extent-tree.c | |
parent | 74b2107543da4ed9607ec484f63c42362dc9fca6 (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/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 9ee6bd55e16c..941b28e78931 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -3174,7 +3174,7 @@ again: | |||
3174 | spin_unlock(&data_sinfo->lock); | 3174 | spin_unlock(&data_sinfo->lock); |
3175 | alloc: | 3175 | alloc: |
3176 | alloc_target = btrfs_get_alloc_profile(root, 1); | 3176 | alloc_target = btrfs_get_alloc_profile(root, 1); |
3177 | trans = btrfs_join_transaction(root, 1); | 3177 | trans = btrfs_join_transaction(root); |
3178 | if (IS_ERR(trans)) | 3178 | if (IS_ERR(trans)) |
3179 | return PTR_ERR(trans); | 3179 | return PTR_ERR(trans); |
3180 | 3180 | ||
@@ -3202,7 +3202,7 @@ alloc: | |||
3202 | commit_trans: | 3202 | commit_trans: |
3203 | if (!committed && !root->fs_info->open_ioctl_trans) { | 3203 | if (!committed && !root->fs_info->open_ioctl_trans) { |
3204 | committed = 1; | 3204 | committed = 1; |
3205 | trans = btrfs_join_transaction(root, 1); | 3205 | trans = btrfs_join_transaction(root); |
3206 | if (IS_ERR(trans)) | 3206 | if (IS_ERR(trans)) |
3207 | return PTR_ERR(trans); | 3207 | return PTR_ERR(trans); |
3208 | ret = btrfs_commit_transaction(trans, root); | 3208 | ret = btrfs_commit_transaction(trans, root); |
@@ -3589,7 +3589,7 @@ again: | |||
3589 | goto out; | 3589 | goto out; |
3590 | 3590 | ||
3591 | ret = -ENOSPC; | 3591 | ret = -ENOSPC; |
3592 | trans = btrfs_join_transaction(root, 1); | 3592 | trans = btrfs_join_transaction(root); |
3593 | if (IS_ERR(trans)) | 3593 | if (IS_ERR(trans)) |
3594 | goto out; | 3594 | goto out; |
3595 | ret = btrfs_commit_transaction(trans, root); | 3595 | ret = btrfs_commit_transaction(trans, root); |
@@ -3816,7 +3816,7 @@ int btrfs_block_rsv_check(struct btrfs_trans_handle *trans, | |||
3816 | if (trans) | 3816 | if (trans) |
3817 | return -EAGAIN; | 3817 | return -EAGAIN; |
3818 | 3818 | ||
3819 | trans = btrfs_join_transaction(root, 1); | 3819 | trans = btrfs_join_transaction(root); |
3820 | BUG_ON(IS_ERR(trans)); | 3820 | BUG_ON(IS_ERR(trans)); |
3821 | ret = btrfs_commit_transaction(trans, root); | 3821 | ret = btrfs_commit_transaction(trans, root); |
3822 | return 0; | 3822 | return 0; |
@@ -7649,7 +7649,7 @@ int btrfs_drop_dead_reloc_roots(struct btrfs_root *root) | |||
7649 | 7649 | ||
7650 | BUG_ON(reloc_root->commit_root != NULL); | 7650 | BUG_ON(reloc_root->commit_root != NULL); |
7651 | while (1) { | 7651 | while (1) { |
7652 | trans = btrfs_join_transaction(root, 1); | 7652 | trans = btrfs_join_transaction(root); |
7653 | BUG_ON(IS_ERR(trans)); | 7653 | BUG_ON(IS_ERR(trans)); |
7654 | 7654 | ||
7655 | mutex_lock(&root->fs_info->drop_mutex); | 7655 | mutex_lock(&root->fs_info->drop_mutex); |
@@ -8176,7 +8176,7 @@ int btrfs_set_block_group_ro(struct btrfs_root *root, | |||
8176 | 8176 | ||
8177 | BUG_ON(cache->ro); | 8177 | BUG_ON(cache->ro); |
8178 | 8178 | ||
8179 | trans = btrfs_join_transaction(root, 1); | 8179 | trans = btrfs_join_transaction(root); |
8180 | BUG_ON(IS_ERR(trans)); | 8180 | BUG_ON(IS_ERR(trans)); |
8181 | 8181 | ||
8182 | alloc_flags = update_block_group_flags(root, cache->flags); | 8182 | alloc_flags = update_block_group_flags(root, cache->flags); |