btrfs: rename __extent_writepage() and drop double underscores

The function does not follow the pattern where the underscores would be
justified, so rename it.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 8de6d226475d6e07b2688094071606785080292f..f7a388529c171bbd6d139086a2c0ced5591b70d8 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1177,7 +1177,7 @@ int btrfs_read_folio(struct file *file, struct folio *folio)
 }
 
 /*
- * helper for __extent_writepage, doing all of the delayed allocation setup.
+ * helper for extent_writepage(), doing all of the delayed allocation setup.
  *
  * This returns 1 if btrfs_run_delalloc_range function did all the work required
  * to write the page (copy into inline extent).  In this case the IO has
@@ -1398,18 +1398,18 @@ static int submit_one_sector(struct btrfs_inode *inode,
 }
 
 /*
- * helper for __extent_writepage.  This calls the writepage start hooks,
+ * Helper for extent_writepage().  This calls the writepage start hooks,
  * and does the loop to map the page into extents and bios.
  *
  * We return 1 if the IO is started and the page is unlocked,
  * 0 if all went well (page still locked)
  * < 0 if there were errors (page still locked)
  */
-static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,
-                                                   struct folio *folio,
-                                                   u64 start, u32 len,
-                                                   struct btrfs_bio_ctrl *bio_ctrl,
-                                                   loff_t i_size)
+static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
+                                                 struct folio *folio,
+                                                 u64 start, u32 len,
+                                                 struct btrfs_bio_ctrl *bio_ctrl,
+                                                 loff_t i_size)
 {
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
        unsigned long range_bitmap = 0;
@@ -1500,7 +1500,7 @@ out:
  * Return 0 if everything goes well.
  * Return <0 for error.
  */
-static int __extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl)
+static int extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ctrl)
 {
        struct inode *inode = folio->mapping->host;
        const u64 page_start = folio_pos(folio);
@@ -1509,7 +1509,7 @@ static int __extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ct
        loff_t i_size = i_size_read(inode);
        unsigned long end_index = i_size >> PAGE_SHIFT;
 
-       trace___extent_writepage(folio, inode, bio_ctrl->wbc);
+       trace_extent_writepage(folio, inode, bio_ctrl->wbc);
 
        WARN_ON(!folio_test_locked(folio));
 
@@ -1534,8 +1534,8 @@ static int __extent_writepage(struct folio *folio, struct btrfs_bio_ctrl *bio_ct
        if (ret)
                goto done;
 
-       ret = __extent_writepage_io(BTRFS_I(inode), folio, folio_pos(folio),
-                                   PAGE_SIZE, bio_ctrl, i_size);
+       ret = extent_writepage_io(BTRFS_I(inode), folio, folio_pos(folio),
+                                 PAGE_SIZE, bio_ctrl, i_size);
        if (ret == 1)
                return 0;
 
@@ -2202,7 +2202,7 @@ retry:
                                continue;
                        }
 
-                       ret = __extent_writepage(folio, bio_ctrl);
+                       ret = extent_writepage(folio, bio_ctrl);
                        if (ret < 0) {
                                done = 1;
                                break;
@@ -2293,8 +2293,8 @@ void extent_write_locked_range(struct inode *inode, const struct folio *locked_f
                if (pages_dirty && folio != locked_folio)
                        ASSERT(folio_test_dirty(folio));
 
-               ret = __extent_writepage_io(BTRFS_I(inode), folio, cur, cur_len,
-                                           &bio_ctrl, i_size);
+               ret = extent_writepage_io(BTRFS_I(inode), folio, cur, cur_len,
+                                         &bio_ctrl, i_size);
                if (ret == 1)
                        goto next_page;
 

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 27aa67f135ff62ec05bf588dc151fdc8e3251766..efe75b03d5f113497824accda5ab6d445319928a 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -747,7 +747,7 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode,
        /*
         * In the successful case (ret == 0 here), cow_file_range will return 1.
         *
-        * Quite a bit further up the callstack in __extent_writepage, ret == 1
+        * Quite a bit further up the callstack in extent_writepage(), ret == 1
         * is treated as a short circuited success and does not unlock the folio,
         * so we must do it here.
         *

diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
index 1dda17b5ab12c0d7d779f42eef8edfb12ad83dca..ca7d2aedfa8d9d5b4d3e3c6282fc7e1791e2660a 100644 (file)
--- a/fs/btrfs/subpage.c
+++ b/fs/btrfs/subpage.c
@@ -705,7 +705,7 @@ void btrfs_folio_assert_not_dirty(const struct btrfs_fs_info *fs_info,
  * - Page locked by plain lock_page()
  *   It should not have any subpage::writers count.
  *   Can be unlocked by unlock_page().
- *   This is the most common locked page for __extent_writepage() called
+ *   This is the most common locked page for extent_writepage() called
  *   inside extent_write_cache_pages().
  *   Rarer cases include the @locked_page from extent_write_locked_range().
  *
@@ -829,7 +829,7 @@ out:
  * Unlike btrfs_folio_end_writer_lock() which unlocks a specified subpage range,
  * this ends all writer locked ranges of a page.
  *
- * This is for the locked page of __extent_writepage(), as the locked page
+ * This is for the locked page of extent_writepage(), as the locked page
  * can contain several locked subpage ranges.
  */
 void btrfs_folio_end_all_writers(const struct btrfs_fs_info *fs_info, struct folio *folio)

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 0eddbb8b67283c0c9ff269c05e880411f97bbd36..e4add61e00f14d17fe43afa06a4e8abaf06ab319 100644 (file)
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -721,7 +721,7 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
                  __entry->writeback_index)
 );
 
-DEFINE_EVENT(btrfs__writepage, __extent_writepage,
+DEFINE_EVENT(btrfs__writepage, extent_writepage,
 
        TP_PROTO(const struct folio *folio, const struct inode *inode,
                 const struct writeback_control *wbc),