]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: remove trivial helper update_nr_written
authorDavid Sterba <dsterba@suse.com>
Tue, 27 Jul 2021 10:45:11 +0000 (12:45 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 16 May 2022 15:17:31 +0000 (17:17 +0200)
The helper used to do more with the wbc state but now it's just one
subtraction, no need to have a special helper.

It became trivial in c8c40b076ba0 ("Btrfs: make mapping->writeback_index
point to the last written page").

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent_io.c

index 66636e43e33950236ea5b9ac1379300ed279c59d..af6c98d38f8ad4512d84e8f04d4bebb2de10d0af 100644 (file)
@@ -3839,12 +3839,6 @@ static inline void contiguous_readpages(struct page *pages[], int nr_pages,
        }
 }
 
-static void update_nr_written(struct writeback_control *wbc,
-                             unsigned long nr_written)
-{
-       wbc->nr_to_write -= nr_written;
-}
-
 /*
  * helper for __extent_writepage, doing all of the delayed allocation setup.
  *
@@ -4007,7 +4001,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,
         * we don't want to touch the inode after unlocking the page,
         * so we update the mapping writeback index now
         */
-       update_nr_written(wbc, 1);
+       wbc->nr_to_write--;
 
        while (cur <= end) {
                u64 disk_bytenr;
@@ -4620,7 +4614,7 @@ static int write_one_subpage_eb(struct extent_buffer *eb,
         * dirty anymore, we have submitted a page.  Update nr_written in wbc.
         */
        if (no_dirty_ebs)
-               update_nr_written(wbc, 1);
+               wbc->nr_to_write--;
        return ret;
 }
 
@@ -4656,7 +4650,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
                        break;
                }
                disk_bytenr += PAGE_SIZE;
-               update_nr_written(wbc, 1);
+               wbc->nr_to_write--;
                unlock_page(p);
        }