Skip to content

Commit

Permalink
Btrfs: kill delay_iput arg to the wait_ordered functions
Browse files Browse the repository at this point in the history 
This is a left over of how we used to wait for ordered extents, which was to
grab the inode and then run filemap flush on it.  However if we have an ordered
extent then we already are holding a ref on the inode, and we just use
btrfs_start_ordered_extent anyway, so there is no reason to have an extra ref on
the inode to start work on the ordered extent.  Thanks,

Signed-off-by: Josef Bacik <[email protected]>
Signed-off-by: Chris Mason <[email protected]>
  • Loading branch information
Josef Bacik authored and Chris Mason committed Sep 21, 2013
1 parent c4fbb43 commit f0de181
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 33 deletions.
4 changes: 2 additions & 2 deletions fs/btrfs/dev-replace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
btrfs_dev_replace_unlock(dev_replace);

btrfs_wait_all_ordered_extents(root->fs_info, 0);
btrfs_wait_all_ordered_extents(root->fs_info);

/* force writing the updated state information to disk */
trans = btrfs_start_transaction(root, 0);
Expand Down Expand Up @@ -475,7 +475,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
return ret;
}
btrfs_wait_all_ordered_extents(root->fs_info, 0);
btrfs_wait_all_ordered_extents(root->fs_info);

trans = btrfs_start_transaction(root, 0);
if (IS_ERR(trans)) {
Expand Down
6 changes: 3 additions & 3 deletions fs/btrfs/extent-tree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3991,7 +3991,7 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root,
*/
btrfs_start_all_delalloc_inodes(root->fs_info, 0);
if (!current->journal_info)
btrfs_wait_all_ordered_extents(root->fs_info, 0);
btrfs_wait_all_ordered_extents(root->fs_info);
}
}

Expand Down Expand Up @@ -4021,7 +4021,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,
if (delalloc_bytes == 0) {
if (trans)
return;
btrfs_wait_all_ordered_extents(root->fs_info, 0);
btrfs_wait_all_ordered_extents(root->fs_info);
return;
}

Expand Down Expand Up @@ -4049,7 +4049,7 @@ static void shrink_delalloc(struct btrfs_root *root, u64 to_reclaim, u64 orig,

loops++;
if (wait_ordered && !trans) {
btrfs_wait_all_ordered_extents(root->fs_info, 0);
btrfs_wait_all_ordered_extents(root->fs_info);
} else {
time_left = schedule_timeout_killable(1);
if (time_left)
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,
if (ret)
return ret;

btrfs_wait_ordered_extents(root, 0);
btrfs_wait_ordered_extents(root);

pending_snapshot = kzalloc(sizeof(*pending_snapshot), GFP_NOFS);
if (!pending_snapshot)
Expand Down
24 changes: 3 additions & 21 deletions fs/btrfs/ordered-data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,11 +563,10 @@ static void btrfs_run_ordered_extent_work(struct btrfs_work *work)
* wait for all the ordered extents in a root. This is done when balancing
* space between drives.
*/
void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)
void btrfs_wait_ordered_extents(struct btrfs_root *root)
{
struct list_head splice, works;
struct btrfs_ordered_extent *ordered, *next;
struct inode *inode;

INIT_LIST_HEAD(&splice);
INIT_LIST_HEAD(&works);
Expand All @@ -580,15 +579,6 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)
root_extent_list);
list_move_tail(&ordered->root_extent_list,
&root->ordered_extents);
/*
* the inode may be getting freed (in sys_unlink path).
*/
inode = igrab(ordered->inode);
if (!inode) {
cond_resched_lock(&root->ordered_extent_lock);
continue;
}

atomic_inc(&ordered->refs);
spin_unlock(&root->ordered_extent_lock);

Expand All @@ -605,21 +595,13 @@ void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput)
list_for_each_entry_safe(ordered, next, &works, work_list) {
list_del_init(&ordered->work_list);
wait_for_completion(&ordered->completion);

inode = ordered->inode;
btrfs_put_ordered_extent(ordered);
if (delay_iput)
btrfs_add_delayed_iput(inode);
else
iput(inode);

cond_resched();
}
mutex_unlock(&root->fs_info->ordered_operations_mutex);
}

void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,
int delay_iput)
void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info)
{
struct btrfs_root *root;
struct list_head splice;
Expand All @@ -637,7 +619,7 @@ void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,
&fs_info->ordered_roots);
spin_unlock(&fs_info->ordered_root_lock);

btrfs_wait_ordered_extents(root, delay_iput);
btrfs_wait_ordered_extents(root);
btrfs_put_fs_root(root);

spin_lock(&fs_info->ordered_root_lock);
Expand Down
5 changes: 2 additions & 3 deletions fs/btrfs/ordered-data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,8 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans,
void btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct inode *inode);
void btrfs_wait_ordered_extents(struct btrfs_root *root, int delay_iput);
void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info,
int delay_iput);
void btrfs_wait_ordered_extents(struct btrfs_root *root);
void btrfs_wait_all_ordered_extents(struct btrfs_fs_info *fs_info);
void btrfs_get_logged_extents(struct btrfs_root *log, struct inode *inode);
void btrfs_wait_logged_extents(struct btrfs_root *log, u64 transid);
void btrfs_free_logged_extents(struct btrfs_root *log, u64 transid);
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/relocation.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4246,7 +4246,7 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start)
err = ret;
goto out;
}
btrfs_wait_all_ordered_extents(fs_info, 0);
btrfs_wait_all_ordered_extents(fs_info);

while (1) {
mutex_lock(&fs_info->cleaner_mutex);
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
return 0;
}

btrfs_wait_all_ordered_extents(fs_info, 1);
btrfs_wait_all_ordered_extents(fs_info);

trans = btrfs_attach_transaction_barrier(root);
if (IS_ERR(trans)) {
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/transaction.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,7 @@ static inline int btrfs_start_delalloc_flush(struct btrfs_fs_info *fs_info)
static inline void btrfs_wait_delalloc_flush(struct btrfs_fs_info *fs_info)
{
if (btrfs_test_opt(fs_info->tree_root, FLUSHONCOMMIT))
btrfs_wait_all_ordered_extents(fs_info, 1);
btrfs_wait_all_ordered_extents(fs_info);
}

int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
Expand Down

0 comments on commit f0de181

Please sign in to comment.