f2fs: remove FAULT_ALLOC_BIO

Sleeping bio allocations do not fail, which means that injecting an error
into sleeping bio allocations is a little silly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst
index dae15c96e659e2bdaaf24cf760912cec855f079e..624f5f3ed93e869f3738625f9f139f9ca6e6159a 100644 (file)
--- a/Documentation/filesystems/f2fs.rst
+++ b/Documentation/filesystems/f2fs.rst
@@ -179,7 +179,6 @@ fault_type=%d                Support configuring fault injection type, should be
                         FAULT_KVMALLOC           0x000000002
                         FAULT_PAGE_ALLOC         0x000000004
                         FAULT_PAGE_GET           0x000000008
-                        FAULT_ALLOC_BIO          0x000000010
                         FAULT_ALLOC_NID          0x000000020
                         FAULT_ORPHAN             0x000000040
                         FAULT_BLOCK              0x000000080

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 0cf0c6059924319904f1c8dc4adffa45f7d545c8..9fb6be65592b1f5ec1546c2cfbd7c9d0853635be 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -50,28 +50,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);
-}
-
-static 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;
@@ -433,7 +411,7 @@ 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)) {
@@ -1029,8 +1007,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);
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 902bd3267c03e14ddd906c136b6fe0640809cb05..6c78365d80ceb5c600a72ec4ce276bf2bdf39766 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -43,7 +43,6 @@ enum {
        FAULT_KVMALLOC,
        FAULT_PAGE_ALLOC,
        FAULT_PAGE_GET,
-       FAULT_ALLOC_BIO,
        FAULT_ALLOC_NID,
        FAULT_ORPHAN,
        FAULT_BLOCK,

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index b4a07fe62d1a58101e1f896bed40c6f3c28b5b81..3a312642907e865be1876d858a9cf268c51660b4 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -45,7 +45,6 @@ const char *f2fs_fault_name[FAULT_MAX] = {
        [FAULT_KVMALLOC]        = "kvmalloc",
        [FAULT_PAGE_ALLOC]      = "page alloc",
        [FAULT_PAGE_GET]        = "page get",
-       [FAULT_ALLOC_BIO]       = "alloc bio",
        [FAULT_ALLOC_NID]       = "alloc nid",
        [FAULT_ORPHAN]          = "orphan",
        [FAULT_BLOCK]           = "no more block",