aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.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/transaction.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/transaction.c')
-rw-r--r--fs/btrfs/transaction.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index c571734d5e5a..70bfb26df967 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -257,22 +257,19 @@ struct btrfs_trans_handle *btrfs_start_transaction(struct btrfs_root *root,
257{ 257{
258 return start_transaction(root, num_items, TRANS_START); 258 return start_transaction(root, num_items, TRANS_START);
259} 259}
260struct btrfs_trans_handle *btrfs_join_transaction(struct btrfs_root *root, 260struct btrfs_trans_handle *btrfs_join_transaction(struct btrfs_root *root)
261 int num_blocks)
262{ 261{
263 return start_transaction(root, 0, TRANS_JOIN); 262 return start_transaction(root, 0, TRANS_JOIN);
264} 263}
265 264
266struct btrfs_trans_handle *btrfs_join_transaction_nolock(struct btrfs_root *root, 265struct btrfs_trans_handle *btrfs_join_transaction_nolock(struct btrfs_root *root)
267 int num_blocks)
268{ 266{
269 return start_transaction(root, 0, TRANS_JOIN_NOLOCK); 267 return start_transaction(root, 0, TRANS_JOIN_NOLOCK);
270} 268}
271 269
272struct btrfs_trans_handle *btrfs_start_ioctl_transaction(struct btrfs_root *r, 270struct btrfs_trans_handle *btrfs_start_ioctl_transaction(struct btrfs_root *root)
273 int num_blocks)
274{ 271{
275 return start_transaction(r, 0, TRANS_USERSPACE); 272 return start_transaction(root, 0, TRANS_USERSPACE);
276} 273}
277 274
278/* wait for a transaction commit to be fully complete */ 275/* wait for a transaction commit to be fully complete */
@@ -1171,7 +1168,7 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
1171 1168
1172 INIT_DELAYED_WORK(&ac->work, do_async_commit); 1169 INIT_DELAYED_WORK(&ac->work, do_async_commit);
1173 ac->root = root; 1170 ac->root = root;
1174 ac->newtrans = btrfs_join_transaction(root, 0); 1171 ac->newtrans = btrfs_join_transaction(root);
1175 if (IS_ERR(ac->newtrans)) { 1172 if (IS_ERR(ac->newtrans)) {
1176 int err = PTR_ERR(ac->newtrans); 1173 int err = PTR_ERR(ac->newtrans);
1177 kfree(ac); 1174 kfree(ac);