Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40012f96 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8ae225a8

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

fs/btrfs/inode.c

+2 −7
Original line number Diff line number Diff line
@@ -10186,12 +10186,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.
@@ -10248,7 +10242,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)) {