aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2016-09-09 21:39:03 -0400
committerDavid Sterba <dsterba@suse.com>2016-12-06 10:07:00 -0500
commit3a45bb207ee2c5548ebf6f5fcc7d249e141f15e8 (patch)
treea1739986199aebac91eca65c5eed7cbe7ad4fded /fs/btrfs/disk-io.c
parentbf89d38febaadd5b1da60fed54929cbde65fedf9 (diff)
btrfs: remove root parameter from transaction commit/end routines
Now we only use the root parameter to print the root objectid in a tracepoint. We can use the root parameter from the transaction handle for that. It's also used to join the transaction with async commits, so we remove the comment that it's just for checking. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 3ce36b526ebe..196f1aafcea9 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1913,7 +1913,7 @@ sleep:
1913 } else { 1913 } else {
1914 int ret; 1914 int ret;
1915 1915
1916 ret = btrfs_commit_transaction(trans, root); 1916 ret = btrfs_commit_transaction(trans);
1917 if (ret) 1917 if (ret)
1918 btrfs_err(fs_info, 1918 btrfs_err(fs_info,
1919 "cleaner open transaction commit returned %d", 1919 "cleaner open transaction commit returned %d",
@@ -1965,9 +1965,9 @@ static int transaction_kthread(void *arg)
1965 goto sleep; 1965 goto sleep;
1966 } 1966 }
1967 if (transid == trans->transid) { 1967 if (transid == trans->transid) {
1968 btrfs_commit_transaction(trans, root); 1968 btrfs_commit_transaction(trans);
1969 } else { 1969 } else {
1970 btrfs_end_transaction(trans, root); 1970 btrfs_end_transaction(trans);
1971 } 1971 }
1972sleep: 1972sleep:
1973 wake_up_process(fs_info->cleaner_kthread); 1973 wake_up_process(fs_info->cleaner_kthread);
@@ -3901,7 +3901,7 @@ int btrfs_commit_super(struct btrfs_fs_info *fs_info)
3901 trans = btrfs_join_transaction(root); 3901 trans = btrfs_join_transaction(root);
3902 if (IS_ERR(trans)) 3902 if (IS_ERR(trans))
3903 return PTR_ERR(trans); 3903 return PTR_ERR(trans);
3904 return btrfs_commit_transaction(trans, root); 3904 return btrfs_commit_transaction(trans);
3905} 3905}
3906 3906
3907void close_ctree(struct btrfs_fs_info *fs_info) 3907void close_ctree(struct btrfs_fs_info *fs_info)