فهرست منبع

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>
Nikolay Borisov 7 سال پیش
والد
کامیت
40012f96b6
2فایلهای تغییر یافته به همراه2 افزوده شده و 8 حذف شده
  1. 0 1
      fs/btrfs/ctree.h
  2. 2 7
      fs/btrfs/inode.c

+ 0 - 1
fs/btrfs/ctree.h

@@ -3173,7 +3173,6 @@ struct btrfs_delalloc_work {
 
 
 struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode,
 struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode,
 						    int delay_iput);
 						    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 extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode,
 		struct page *page, size_t pg_offset, u64 start,
 		struct page *page, size_t pg_offset, u64 start,

+ 2 - 7
fs/btrfs/inode.c

@@ -10186,12 +10186,6 @@ struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode,
 	return work;
 	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
  * some fairly slow code that needs optimization. This walks the list
  * of all the inodes with pending delalloc and forces them to disk.
  * 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:
 out:
 	list_for_each_entry_safe(work, next, &works, list) {
 	list_for_each_entry_safe(work, next, &works, list) {
 		list_del_init(&work->list);
 		list_del_init(&work->list);
-		btrfs_wait_and_free_delalloc_work(work);
+		wait_for_completion(&work->completion);
+		kfree(work);
 	}
 	}
 
 
 	if (!list_empty(&splice)) {
 	if (!list_empty(&splice)) {