From: Gao Xiang <gaoxian...@huawei.com>

As Christoph pointed out [1], "
Why is there __submit_bio which really just obsfucates
what is going on?  Also why is __submit_bio using
bio_set_op_attrs instead of opencode it as the comment
right next to it asks you to? "

Let's use submit_bio directly instead.

[1] https://lore.kernel.org/lkml/20190830162812.ga10...@infradead.org/
Reported-by: Christoph Hellwig <h...@infradead.org>
Signed-off-by: Gao Xiang <gaoxian...@huawei.com>
---
 fs/erofs/data.c     | 15 ++++++++-------
 fs/erofs/internal.h |  9 ++-------
 fs/erofs/zdata.c    |  6 +++---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 837b07cd2761..d3cd7a453648 100644
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -57,14 +57,15 @@ struct page *erofs_get_meta_page(struct super_block *sb, 
erofs_blk_t blkaddr)
        if (!PageUptodate(page)) {
                struct bio *bio;
 
-               bio = erofs_grab_bio(sb, blkaddr, 1, sb, read_endio);
+               bio = erofs_grab_bio(sb, REQ_OP_READ | REQ_META,
+                                    blkaddr, 1, sb, read_endio);
 
                if (bio_add_page(bio, page, PAGE_SIZE, 0) != PAGE_SIZE) {
                        err = -EFAULT;
                        goto err_out;
                }
 
-               __submit_bio(bio, REQ_OP_READ, REQ_META);
+               submit_bio(bio);
                lock_page(page);
 
                /* this page has been truncated by others */
@@ -188,7 +189,7 @@ static inline struct bio *erofs_read_raw_page(struct bio 
*bio,
            /* not continuous */
            *last_block + 1 != current_block) {
 submit_bio_retry:
-               __submit_bio(bio, REQ_OP_READ, 0);
+               submit_bio(bio);
                bio = NULL;
        }
 
@@ -258,7 +259,8 @@ static inline struct bio *erofs_read_raw_page(struct bio 
*bio,
                if (nblocks > BIO_MAX_PAGES)
                        nblocks = BIO_MAX_PAGES;
 
-               bio = erofs_grab_bio(sb, blknr, nblocks, sb, read_endio);
+               bio = erofs_grab_bio(sb, REQ_OP_READ, blknr, nblocks,
+                                    sb, read_endio);
        }
 
        err = bio_add_page(bio, page, PAGE_SIZE, 0);
@@ -289,8 +291,7 @@ static inline struct bio *erofs_read_raw_page(struct bio 
*bio,
        /* if updated manually, continuous pages has a gap */
        if (bio)
 submit_bio_out:
-               __submit_bio(bio, REQ_OP_READ, 0);
-
+               submit_bio(bio);
        return err ? ERR_PTR(err) : NULL;
 }
 
@@ -354,7 +355,7 @@ static int erofs_raw_access_readpages(struct file *filp,
 
        /* the rare case (end in gaps) */
        if (bio)
-               __submit_bio(bio, REQ_OP_READ, 0);
+               submit_bio(bio);
        return 0;
 }
 
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 40d4dd47bb7a..15545959af92 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -406,6 +406,7 @@ static inline int z_erofs_map_blocks_iter(struct inode 
*inode,
 
 /* data.c */
 static inline struct bio *erofs_grab_bio(struct super_block *sb,
+                                        unsigned int bi_opf,
                                         erofs_blk_t blkaddr,
                                         unsigned int nr_pages,
                                         void *bi_private, bio_end_io_t endio)
@@ -416,16 +417,10 @@ static inline struct bio *erofs_grab_bio(struct 
super_block *sb,
        bio_set_dev(bio, sb->s_bdev);
        bio->bi_iter.bi_sector = (sector_t)blkaddr << LOG_SECTORS_PER_BLOCK;
        bio->bi_private = bi_private;
+       bio->bi_opf = bi_opf;
        return bio;
 }
 
-static inline void __submit_bio(struct bio *bio, unsigned int op,
-                               unsigned int op_flags)
-{
-       bio_set_op_attrs(bio, op, op_flags);
-       submit_bio(bio);
-}
-
 struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr);
 
 int erofs_map_blocks(struct inode *, struct erofs_map_blocks *, int);
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index abe28565d6c0..ce1a0f2997a9 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1258,12 +1258,12 @@ static bool z_erofs_vle_submit_all(struct super_block 
*sb,
 
                if (bio && force_submit) {
 submit_bio_retry:
-                       __submit_bio(bio, REQ_OP_READ, 0);
+                       submit_bio(bio);
                        bio = NULL;
                }
 
                if (!bio) {
-                       bio = erofs_grab_bio(sb, first_index + i,
+                       bio = erofs_grab_bio(sb, REQ_OP_READ, first_index + i,
                                             BIO_MAX_PAGES, bi_private,
                                             z_erofs_vle_read_endio);
                        ++nr_bios;
@@ -1286,7 +1286,7 @@ static bool z_erofs_vle_submit_all(struct super_block *sb,
        } while (owned_head != Z_EROFS_PCLUSTER_TAIL);
 
        if (bio)
-               __submit_bio(bio, REQ_OP_READ, 0);
+               submit_bio(bio);
 
        if (postsubmit_is_all_bypassed(q, nr_bios, force_fg))
                return true;
-- 
2.17.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to