aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.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/disk-io.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/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 228cf36ece83..9d6c9e332ca3 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1568,7 +1568,7 @@ static int transaction_kthread(void *arg)
1568 transid = cur->transid; 1568 transid = cur->transid;
1569 spin_unlock(&root->fs_info->new_trans_lock); 1569 spin_unlock(&root->fs_info->new_trans_lock);
1570 1570
1571 trans = btrfs_join_transaction(root, 1); 1571 trans = btrfs_join_transaction(root);
1572 BUG_ON(IS_ERR(trans)); 1572 BUG_ON(IS_ERR(trans));
1573 if (transid == trans->transid) { 1573 if (transid == trans->transid) {
1574 ret = btrfs_commit_transaction(trans, root); 1574 ret = btrfs_commit_transaction(trans, root);
@@ -2495,13 +2495,13 @@ int btrfs_commit_super(struct btrfs_root *root)
2495 down_write(&root->fs_info->cleanup_work_sem); 2495 down_write(&root->fs_info->cleanup_work_sem);
2496 up_write(&root->fs_info->cleanup_work_sem); 2496 up_write(&root->fs_info->cleanup_work_sem);
2497 2497
2498 trans = btrfs_join_transaction(root, 1); 2498 trans = btrfs_join_transaction(root);
2499 if (IS_ERR(trans)) 2499 if (IS_ERR(trans))
2500 return PTR_ERR(trans); 2500 return PTR_ERR(trans);
2501 ret = btrfs_commit_transaction(trans, root); 2501 ret = btrfs_commit_transaction(trans, root);
2502 BUG_ON(ret); 2502 BUG_ON(ret);
2503 /* run commit again to drop the original snapshot */ 2503 /* run commit again to drop the original snapshot */
2504 trans = btrfs_join_transaction(root, 1); 2504 trans = btrfs_join_transaction(root);
2505 if (IS_ERR(trans)) 2505 if (IS_ERR(trans))
2506 return PTR_ERR(trans); 2506 return PTR_ERR(trans);
2507 btrfs_commit_transaction(trans, root); 2507 btrfs_commit_transaction(trans, root);