Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: flush_space always takes fs_info->fs_root

Browse Source 
We don't need to pass a root to flush_space since it always uses
the fs_root.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Jeff Mahoney 2017-02-15 16:28:28 -05:00 committed by David Sterba
parent 87bde3cdfc
commit 0c9ab349c2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/btrfs/extent-tree.c
View File

@ -4797,11 +4797,10 @@ skip_async:
* get us somewhere and then commit the transaction if it does. Otherwise it * get us somewhere and then commit the transaction if it does. Otherwise it
* will return -ENOSPC. * will return -ENOSPC.
*/ */
static int may_commit_transaction(struct btrfs_root *root, static int may_commit_transaction(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *space_info, struct btrfs_space_info *space_info,
u64 bytes, int force) u64 bytes, int force)
{ {
struct btrfs_fs_info *fs_info = root->fs_info;
struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_block_rsv; struct btrfs_block_rsv *delayed_rsv = &fs_info->delayed_block_rsv;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
@ -4833,7 +4832,7 @@ static int may_commit_transaction(struct btrfs_root *root,
spin_unlock(&delayed_rsv->lock); spin_unlock(&delayed_rsv->lock);
commit: commit:
trans = btrfs_join_transaction(root); trans = btrfs_join_transaction(fs_info->fs_root);
if (IS_ERR(trans)) if (IS_ERR(trans))
return -ENOSPC; return -ENOSPC;
@ -4847,11 +4846,11 @@ struct reserve_ticket {
wait_queue_head_t wait; wait_queue_head_t wait;
}; };
static int flush_space(struct btrfs_root *root, static int flush_space(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *space_info, u64 num_bytes, struct btrfs_space_info *space_info, u64 num_bytes,
u64 orig_bytes, int state) u64 orig_bytes, int state)
{ {
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_root *root = fs_info->fs_root;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
int nr; int nr;
int ret = 0; int ret = 0;
@ -4891,7 +4890,8 @@ static int flush_space(struct btrfs_root *root,
ret = 0; ret = 0;
break; break;
case COMMIT_TRANS: case COMMIT_TRANS:
ret = may_commit_transaction(root, space_info, orig_bytes, 0); ret = may_commit_transaction(fs_info, space_info,
orig_bytes, 0);
break; break;
default: default:
ret = -ENOSPC; ret = -ENOSPC;
@ -5003,8 +5003,8 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work)
struct reserve_ticket *ticket; struct reserve_ticket *ticket;
int ret; int ret;
ret = flush_space(fs_info->fs_root, space_info, to_reclaim, ret = flush_space(fs_info, space_info, to_reclaim, to_reclaim,
to_reclaim, flush_state); flush_state);
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
if (list_empty(&space_info->tickets)) { if (list_empty(&space_info->tickets)) {
space_info->flush = 0; space_info->flush = 0;
@ -5059,8 +5059,8 @@ static void priority_reclaim_metadata_space(struct btrfs_fs_info *fs_info,
spin_unlock(&space_info->lock); spin_unlock(&space_info->lock);
do { do {
flush_space(fs_info->fs_root, space_info, to_reclaim, flush_space(fs_info, space_info, to_reclaim, to_reclaim,
to_reclaim, flush_state); flush_state);
flush_state++; flush_state++;
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
if (ticket->bytes == 0) { if (ticket->bytes == 0) {