f2fs: clean up w/ bio_add_folio_nofail()

In add_bio_entry(), adding a page to newly allocated bio should never fail,
let's use bio_add_folio_nofail() instead of bio_add_page() & unnecessary
error handling for cleanup.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 16a713013427476fbc0d765cf913db3d6112c539..d8a9f8f8cb5dbf88019149d4706740482f07bb41 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -752,7 +752,7 @@ static bool io_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,
 }
 
 static void add_bio_entry(struct f2fs_sb_info *sbi, struct bio *bio,
-                               struct page *page, enum temp_type temp)
+                               struct folio *folio, enum temp_type temp)
 {
        struct f2fs_bio_info *io = sbi->write_io[DATA] + temp;
        struct bio_entry *be;
@@ -761,8 +761,7 @@ static void add_bio_entry(struct f2fs_sb_info *sbi, struct bio *bio,
        be->bio = bio;
        bio_get(bio);
 
-       if (bio_add_page(bio, page, PAGE_SIZE, 0) != PAGE_SIZE)
-               f2fs_bug_on(sbi, 1);
+       bio_add_folio_nofail(bio, folio, folio_size(folio), 0);
 
        f2fs_down_write(&io->bio_list_lock);
        list_add_tail(&be->list, &io->bio_list);
@@ -904,7 +903,7 @@ alloc_new:
                f2fs_set_bio_crypt_ctx(bio, folio->mapping->host,
                                folio->index, fio, GFP_NOIO);
 
-               add_bio_entry(fio->sbi, bio, &data_folio->page, fio->temp);
+               add_bio_entry(fio->sbi, bio, data_folio, fio->temp);
        } else {
                if (add_ipu_page(fio, &bio, &data_folio->page))
                        goto alloc_new;