diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-04-19 10:46:39 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-05-07 14:51:07 +0200 |
| commit | 3f42b8307a507073408d1d7cc394d8371e30d33a (patch) | |
| tree | 65c9bd1665f5e3ed684e0517cf430a313811e992 /fs | |
| parent | a68ec4777f27c72e7ac0b008e936b85a4654017e (diff) | |
| download | linux-next-3f42b8307a507073408d1d7cc394d8371e30d33a.tar.gz | |
btrfs: Remove btrfs_wait_and_free_delalloc_work
This function is called from only 1 place and is effectively a wrapper
over wait_completion/kfree. It doesn't really bring any value having
those two calls in a separate function. Just open code it and remove it.
No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/ctree.h | 1 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 9e5787f92ed7..aac3a8bfab51 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3173,7 +3173,6 @@ struct btrfs_delalloc_work { struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode, int delay_iput); -void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work); struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, struct page *page, size_t pg_offset, u64 start, diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 581450a2eaae..c0a38917539d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10185,12 +10185,6 @@ struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode, return work; } -void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work) -{ - wait_for_completion(&work->completion); - kfree(work); -} - /* * some fairly slow code that needs optimization. This walks the list * of all the inodes with pending delalloc and forces them to disk. @@ -10247,7 +10241,8 @@ static int __start_delalloc_inodes(struct btrfs_root *root, int delay_iput, out: list_for_each_entry_safe(work, next, &works, list) { list_del_init(&work->list); - btrfs_wait_and_free_delalloc_work(work); + wait_for_completion(&work->completion); + kfree(work); } if (!list_empty(&splice)) { |