[v3,34/46] btrfs: Make writepage_delalloc take btrfs_inode

Commit Message

Nikolay Borisov June 5, 2020, 7:42 a.m. UTC

Only find_lock_delalloc_range uses vfs_inode so let's take the btrfs_inode
as a parameter.

Signed-off-by: Nikolay Borisov <[e-mail]>
---
V3:
 * Added extra newline between changelog and SOB line

 fs/btrfs/extent_io.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--
2.17.1

Patch

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 58a07587efcd..2068a2c38e0c 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3424,7 +3424,7 @@  static void update_nr_written(struct writeback_control *wbc,
  * This returns 0 if all went well (page still locked)
  * This returns < 0 if there were errors (page still locked)
  */
-static noinline_for_stack int writepage_delalloc(struct inode *inode,
+static noinline_for_stack int writepage_delalloc(struct btrfs_inode *inode,
 		struct page *page, struct writeback_control *wbc,
 		u64 delalloc_start, unsigned long *nr_written)
 {
@@ -3437,15 +3437,14 @@  static noinline_for_stack int writepage_delalloc(struct inode *inode,


 	while (delalloc_end < page_end) {
-		found = find_lock_delalloc_range(inode, page,
+		found = find_lock_delalloc_range(&inode->vfs_inode, page,
 					       &delalloc_start,
 					       &delalloc_end);
 		if (!found) {
 			delalloc_start = delalloc_end + 1;
 			continue;
 		}
-		ret = btrfs_run_delalloc_range(BTRFS_I(inode), page,
-					       delalloc_start,
+		ret = btrfs_run_delalloc_range(inode, page, delalloc_start,
 					       delalloc_end, &page_started,
 					       nr_written, wbc);
 		if (ret) {
@@ -3664,7 +3663,8 @@  static int __extent_writepage(struct page *page, struct writeback_control *wbc,
 	set_page_extent_mapped(page);

 	if (!epd->extent_locked) {
-		ret = writepage_delalloc(inode, page, wbc, start, &nr_written);
+		ret = writepage_delalloc(BTRFS_I(inode), page, wbc, start,
+					 &nr_written);
 		if (ret == 1)
 			return 0;
 		if (ret)