[PATCH 5/7] mm: remove the __swap_writepage return value

[Christoph Hellwig]

__swap_writepage always returns 0.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 mm/page_io.c | 23 +++++++++--------------
 mm/swap.h    |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/mm/page_io.c b/mm/page_io.c
index 21ce4505f00607..c373d5694cdffd 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -178,11 +178,11 @@ int generic_swapfile_activate(struct swap_info_struct 
*sis,
 int swap_writepage(struct page *page, struct writeback_control *wbc)
 {
        struct folio *folio = page_folio(page);
-       int ret = 0;
+       int ret;
 
        if (folio_free_swap(folio)) {
                folio_unlock(folio);
-               goto out;
+               return 0;
        }
        /*
         * Arch code may have to preserve more data than just the page
@@ -192,17 +192,16 @@ int swap_writepage(struct page *page, struct 
writeback_control *wbc)
        if (ret) {
                folio_mark_dirty(folio);
                folio_unlock(folio);
-               goto out;
+               return ret;
        }
        if (frontswap_store(&folio->page) == 0) {
                folio_start_writeback(folio);
                folio_unlock(folio);
                folio_end_writeback(folio);
-               goto out;
+               return 0;
        }
-       ret = __swap_writepage(&folio->page, wbc);
-out:
-       return ret;
+       __swap_writepage(&folio->page, wbc);
+       return 0;
 }
 
 static inline void count_swpout_vm_event(struct page *page)
@@ -289,7 +288,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret)
        mempool_free(sio, sio_pool);
 }
 
-static int swap_writepage_fs(struct page *page, struct writeback_control *wbc)
+static void swap_writepage_fs(struct page *page, struct writeback_control *wbc)
 {
        struct swap_iocb *sio = NULL;
        struct swap_info_struct *sis = page_swap_info(page);
@@ -326,11 +325,9 @@ static int swap_writepage_fs(struct page *page, struct 
writeback_control *wbc)
        }
        if (wbc->swap_plug)
                *wbc->swap_plug = sio;
-
-       return 0;
 }
 
-int __swap_writepage(struct page *page, struct writeback_control *wbc)
+void __swap_writepage(struct page *page, struct writeback_control *wbc)
 {
        struct bio *bio;
        int ret;
@@ -348,7 +345,7 @@ int __swap_writepage(struct page *page, struct 
writeback_control *wbc)
        ret = bdev_write_page(sis->bdev, swap_page_sector(page), page, wbc);
        if (!ret) {
                count_swpout_vm_event(page);
-               return 0;
+               return;
        }
 
        bio = bio_alloc(sis->bdev, 1,
@@ -363,8 +360,6 @@ int __swap_writepage(struct page *page, struct 
writeback_control *wbc)
        set_page_writeback(page);
        unlock_page(page);
        submit_bio(bio);
-
-       return 0;
 }
 
 void swap_write_unplug(struct swap_iocb *sio)
diff --git a/mm/swap.h b/mm/swap.h
index f5eb5069d28c2e..28be6cb3277fa4 100644
--- a/mm/swap.h
+++ b/mm/swap.h
@@ -17,7 +17,7 @@ static inline void swap_read_unplug(struct swap_iocb *plug)
 }
 void swap_write_unplug(struct swap_iocb *sio);
 int swap_writepage(struct page *page, struct writeback_control *wbc);
-int __swap_writepage(struct page *page, struct writeback_control *wbc);
+void __swap_writepage(struct page *page, struct writeback_control *wbc);
 
 /* linux/mm/swap_state.c */
 /* One swap address space for each 64M swap space */
-- 
2.39.0