Merge tag 'for-5.12/block-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 1ee966a..b9721c8 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -49,27 +49,6 @@ void f2fs_destroy_bioset(void)
        bioset_exit(&f2fs_bioset);
 }
 
-static inline struct bio *__f2fs_bio_alloc(gfp_t gfp_mask,
-                                               unsigned int nr_iovecs)
-{
-       return bio_alloc_bioset(gfp_mask, nr_iovecs, &f2fs_bioset);
-}
-
-struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool noio)
-{
-       if (noio) {
-               /* No failure on bio allocation */
-               return __f2fs_bio_alloc(GFP_NOIO, npages);
-       }
-
-       if (time_to_inject(sbi, FAULT_ALLOC_BIO)) {
-               f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO);
-               return NULL;
-       }
-
-       return __f2fs_bio_alloc(GFP_KERNEL, npages);
-}
-
 static bool __is_cp_guaranteed(struct page *page)
 {
        struct address_space *mapping = page->mapping;
@@ -398,22 +377,12 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)
        return 0;
 }
 
-/*
- * Return true, if pre_bio's bdev is same as its target device.
- */
-static bool __same_bdev(struct f2fs_sb_info *sbi,
-                               block_t blk_addr, struct bio *bio)
-{
-       struct block_device *b = f2fs_target_device(sbi, blk_addr, NULL);
-       return bio->bi_disk == b->bd_disk && bio->bi_partno == b->bd_partno;
-}
-
 static struct bio *__bio_alloc(struct f2fs_io_info *fio, int npages)
 {
        struct f2fs_sb_info *sbi = fio->sbi;
        struct bio *bio;
 
-       bio = f2fs_bio_alloc(sbi, npages, true);
+       bio = bio_alloc_bioset(GFP_NOIO, npages, &f2fs_bioset);
 
        f2fs_target_device(sbi, fio->new_blkaddr, bio);
        if (is_read_io(fio->op)) {
@@ -711,7 +680,7 @@ static bool page_is_mergeable(struct f2fs_sb_info *sbi, struct bio *bio,
                return false;
        if (last_blkaddr + 1 != cur_blkaddr)
                return false;
-       return __same_bdev(sbi, cur_blkaddr, bio);
+       return bio->bi_bdev == f2fs_target_device(sbi, cur_blkaddr, NULL);
 }
 
 static bool io_type_is_mergeable(struct f2fs_bio_info *io,
@@ -999,8 +968,9 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,
        struct bio_post_read_ctx *ctx;
        unsigned int post_read_steps = 0;
 
-       bio = f2fs_bio_alloc(sbi, min_t(int, nr_pages, BIO_MAX_PAGES),
-                                                               for_write);
+       bio = bio_alloc_bioset(for_write ? GFP_NOIO : GFP_KERNEL,
+                              min_t(int, nr_pages, BIO_MAX_PAGES),
+                              &f2fs_bioset);
        if (!bio)
                return ERR_PTR(-ENOMEM);