From: Gao Xiang <gaoxiang25@huawei.com> To: Chao Yu <yuchao0@huawei.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Christoph Hellwig <hch@lst.de>, <devel@driverdev.osuosl.org> Cc: linux-fsdevel@vger.kernel.org, Miao Xie <miaoxie@huawei.com>, linux-erofs@lists.ozlabs.org Subject: [PATCH v2 17/25] erofs: kill __submit_bio() Date: Wed, 4 Sep 2019 10:09:04 +0800 Message-ID: <20190904020912.63925-18-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190904020912.63925-1-gaoxiang25@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/r/20190830162812.GA10694@infradead.org/ Reported-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com> --- fs/erofs/data.c | 21 +++++++++++++-------- fs/erofs/internal.h | 7 ------- fs/erofs/zdata.c | 6 ++++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 28eda71bb1a9..70b1e353756e 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -40,7 +40,8 @@ static inline void read_endio(struct bio *bio) static struct bio *erofs_grab_raw_bio(struct super_block *sb, erofs_blk_t blkaddr, - unsigned int nr_pages) + unsigned int nr_pages, + bool ismeta) { struct bio *bio = bio_alloc(GFP_NOIO, nr_pages); @@ -48,6 +49,11 @@ static struct bio *erofs_grab_raw_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 = sb; + if (ismeta) + bio->bi_opf = REQ_OP_READ | REQ_META; + else + bio->bi_opf = REQ_OP_READ; + return bio; } @@ -69,14 +75,14 @@ struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr) if (!PageUptodate(page)) { struct bio *bio; - bio = erofs_grab_raw_bio(sb, blkaddr, 1); + bio = erofs_grab_raw_bio(sb, blkaddr, 1, true); 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 */ @@ -201,7 +207,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; } @@ -271,7 +277,7 @@ static inline struct bio *erofs_read_raw_page(struct bio *bio, if (nblocks > BIO_MAX_PAGES) nblocks = BIO_MAX_PAGES; - bio = erofs_grab_raw_bio(sb, blknr, nblocks); + bio = erofs_grab_raw_bio(sb, blknr, nblocks, false); } err = bio_add_page(bio, page, PAGE_SIZE, 0); @@ -302,8 +308,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; } @@ -367,7 +372,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 90c62fb5f80d..13c8d841c43a 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -409,13 +409,6 @@ static inline int z_erofs_map_blocks_iter(struct inode *inode, #endif /* !CONFIG_EROFS_FS_ZIP */ /* data.c */ -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 21ade322cc81..3010fa3d1ac3 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1258,7 +1258,7 @@ 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; } @@ -1270,6 +1270,8 @@ static bool z_erofs_vle_submit_all(struct super_block *sb, bio->bi_iter.bi_sector = (sector_t)(first_index + i) << LOG_SECTORS_PER_BLOCK; bio->bi_private = bi_private; + bio->bi_opf = REQ_OP_READ; + ++nr_bios; } @@ -1290,7 +1292,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
next prev parent reply index Thread overview: 159+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-02 12:53 [PATCH v6 00/24] erofs: promote erofs from staging Gao Xiang 2019-08-02 12:53 ` [PATCH v6 01/24] erofs: add on-disk layout Gao Xiang 2019-08-29 9:59 ` Christoph Hellwig 2019-08-29 10:32 ` Gao Xiang 2019-08-29 10:36 ` Christoph Hellwig 2019-08-29 10:58 ` Gao Xiang 2019-08-29 15:58 ` Joe Perches 2019-08-29 17:26 ` Gao Xiang 2019-08-30 12:07 ` David Sterba 2019-08-30 12:18 ` Gao Xiang via Linux-erofs 2019-09-02 8:43 ` Pavel Machek 2019-09-02 14:07 ` David Sterba 2019-09-03 11:27 ` Pavel Machek 2019-08-29 15:41 ` Gao Xiang 2019-09-01 7:54 ` Gao Xiang via Linux-erofs 2019-09-02 12:45 ` Christoph Hellwig 2019-09-02 13:02 ` Gao Xiang 2019-09-02 8:40 ` Pavel Machek 2019-09-02 10:35 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 02/24] erofs: add erofs in-memory stuffs Gao Xiang 2019-08-02 12:53 ` [PATCH v6 03/24] erofs: add super block operations Gao Xiang 2019-08-29 10:15 ` Christoph Hellwig 2019-08-29 10:50 ` Gao Xiang 2019-08-30 16:39 ` Christoph Hellwig 2019-08-30 17:15 ` Gao Xiang 2019-08-31 0:54 ` Gao Xiang 2019-08-31 6:34 ` Amir Goldstein 2019-08-31 6:48 ` Gao Xiang 2019-09-01 8:54 ` Gao Xiang via Linux-erofs 2019-09-02 12:51 ` Christoph Hellwig 2019-09-02 14:43 ` Gao Xiang 2019-09-02 15:19 ` Christoph Hellwig 2019-09-02 15:24 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 04/24] erofs: add raw address_space operations Gao Xiang 2019-08-29 10:17 ` Christoph Hellwig 2019-08-29 11:46 ` Gao Xiang 2019-08-30 16:40 ` Christoph Hellwig 2019-08-30 17:23 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 05/24] erofs: add inode operations Gao Xiang 2019-08-29 10:24 ` Christoph Hellwig 2019-08-29 11:59 ` Gao Xiang 2019-08-30 16:42 ` Christoph Hellwig 2019-08-30 18:46 ` Gao Xiang 2019-09-01 9:34 ` Gao Xiang via Linux-erofs 2019-09-02 12:53 ` Christoph Hellwig 2019-09-02 13:43 ` David Sterba 2019-09-02 13:55 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 06/24] erofs: support special inode Gao Xiang 2019-08-29 10:25 ` Christoph Hellwig 2019-09-01 9:39 ` Gao Xiang via Linux-erofs 2019-08-02 12:53 ` [PATCH v6 07/24] erofs: add directory operations Gao Xiang 2019-08-02 12:53 ` [PATCH v6 08/24] erofs: add namei functions Gao Xiang 2019-08-29 10:28 ` Christoph Hellwig 2019-08-29 11:28 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 09/24] erofs: support tracepoint Gao Xiang 2019-08-02 12:53 ` [PATCH v6 10/24] erofs: update Kconfig and Makefile Gao Xiang 2019-08-02 12:53 ` [PATCH v6 11/24] erofs: introduce xattr & posixacl support Gao Xiang 2019-08-02 12:53 ` [PATCH v6 12/24] erofs: introduce tagged pointer Gao Xiang 2019-08-02 12:53 ` [PATCH v6 13/24] erofs: add compression indexes support Gao Xiang 2019-08-02 12:53 ` [PATCH v6 14/24] erofs: introduce superblock registration Gao Xiang 2019-08-02 12:53 ` [PATCH v6 15/24] erofs: introduce erofs shrinker Gao Xiang 2019-08-02 12:53 ` [PATCH v6 16/24] erofs: introduce workstation for decompression Gao Xiang 2019-08-02 12:53 ` [PATCH v6 17/24] erofs: introduce per-CPU buffers implementation Gao Xiang 2019-08-02 12:53 ` [PATCH v6 18/24] erofs: introduce pagevec for decompression subsystem Gao Xiang 2019-08-02 12:53 ` [PATCH v6 19/24] erofs: add erofs_allocpage() Gao Xiang 2019-08-02 12:53 ` [PATCH v6 20/24] erofs: introduce generic decompression backend Gao Xiang 2019-08-02 12:53 ` [PATCH v6 21/24] erofs: introduce LZ4 decompression inplace Gao Xiang 2019-08-02 12:53 ` [PATCH v6 22/24] erofs: introduce the decompression frontend Gao Xiang 2019-08-02 12:53 ` [PATCH v6 23/24] erofs: introduce cached decompression Gao Xiang 2019-08-02 12:53 ` [PATCH v6 24/24] erofs: add document Gao Xiang 2019-09-01 5:51 ` [PATCH 00/21] erofs: patchset addressing Christoph's comments Gao Xiang via Linux-erofs 2019-09-01 5:51 ` [PATCH 01/21] erofs: remove all the byte offset comments Gao Xiang via Linux-erofs 2019-09-02 12:05 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 02/21] erofs: on-disk format should have explicitly assigned numbers Gao Xiang via Linux-erofs 2019-09-02 12:05 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 03/21] erofs: some macros are much more readable as a function Gao Xiang via Linux-erofs 2019-09-02 12:06 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 04/21] erofs: kill __packed for on-disk structures Gao Xiang via Linux-erofs 2019-09-02 12:06 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 05/21] erofs: update erofs_inode_is_data_compressed helper Gao Xiang via Linux-erofs 2019-09-02 12:07 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 06/21] erofs: kill erofs_{init,exit}_inode_cache Gao Xiang via Linux-erofs 2019-09-02 12:09 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 07/21] erofs: use erofs_inode naming Gao Xiang via Linux-erofs 2019-09-02 12:10 ` Christoph Hellwig 2019-09-02 12:13 ` Gao Xiang 2019-09-02 12:47 ` Christoph Hellwig 2019-09-02 13:33 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 08/21] erofs: update comments in inode.c Gao Xiang via Linux-erofs 2019-09-01 5:51 ` [PATCH 09/21] erofs: update erofs symlink stuffs Gao Xiang via Linux-erofs 2019-09-02 12:11 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 10/21] erofs: kill is_inode_layout_compression() Gao Xiang via Linux-erofs 2019-09-02 12:11 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 11/21] erofs: use dsb instead of layout for ondisk super_block Gao Xiang via Linux-erofs 2019-09-02 12:12 ` Christoph Hellwig 2019-09-02 12:15 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 12/21] erofs: kill verbose debug info in erofs_fill_super Gao Xiang via Linux-erofs 2019-09-02 12:14 ` Christoph Hellwig 2019-09-02 12:18 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 13/21] erofs: simplify erofs_grab_bio() since bio_alloc() never fail Gao Xiang via Linux-erofs 2019-09-02 12:20 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 14/21] erofs: kill prio and nofail of erofs_get_meta_page() Gao Xiang via Linux-erofs 2019-09-02 12:21 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 15/21] erofs: kill __submit_bio() Gao Xiang via Linux-erofs 2019-09-01 5:51 ` [PATCH 16/21] erofs: kill magic underscores Gao Xiang via Linux-erofs 2019-09-02 12:26 ` Christoph Hellwig 2019-09-02 12:39 ` Gao Xiang 2019-09-02 12:54 ` Christoph Hellwig 2019-09-02 13:38 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 17/21] erofs: use a switch statement when dealing with the file modes Gao Xiang via Linux-erofs 2019-09-02 12:27 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 18/21] erofs: add "erofs_" prefix for common and short functions Gao Xiang via Linux-erofs 2019-09-02 12:28 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 19/21] erofs: kill all erofs specific fault injection Gao Xiang via Linux-erofs 2019-09-02 12:28 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 20/21] erofs: kill use_vmap module parameter Gao Xiang via Linux-erofs 2019-09-02 12:31 ` Christoph Hellwig 2019-09-02 12:43 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 21/21] erofs: save one level of indentation Gao Xiang via Linux-erofs 2019-09-02 12:31 ` Christoph Hellwig 2019-09-02 12:46 ` [PATCH 00/21] erofs: patchset addressing Christoph's comments Christoph Hellwig 2019-09-02 14:24 ` Gao Xiang 2019-09-02 15:23 ` Christoph Hellwig 2019-09-02 15:50 ` Gao Xiang 2019-09-03 6:58 ` Christoph Hellwig 2019-09-03 8:17 ` Gao Xiang 2019-09-03 15:37 ` Christoph Hellwig 2019-09-03 15:43 ` Gao Xiang via Linux-erofs 2019-09-04 2:08 ` [PATCH v2 00/25] " Gao Xiang 2019-09-04 2:08 ` [PATCH v2 01/25] erofs: remove all the byte offset comments Gao Xiang 2019-09-04 2:08 ` [PATCH v2 02/25] erofs: on-disk format should have explicitly assigned numbers Gao Xiang 2019-09-04 2:08 ` [PATCH v2 03/25] erofs: some macros are much more readable as a function Gao Xiang 2019-09-04 2:08 ` [PATCH v2 04/25] erofs: kill __packed for on-disk structures Gao Xiang 2019-09-04 2:08 ` [PATCH v2 05/25] erofs: update erofs_inode_is_data_compressed helper Gao Xiang 2019-09-04 2:08 ` [PATCH v2 06/25] erofs: use feature_incompat rather than requirements Gao Xiang 2019-09-04 2:08 ` [PATCH v2 07/25] erofs: better naming for erofs inode related stuffs Gao Xiang 2019-09-04 2:08 ` [PATCH v2 08/25] erofs: kill erofs_{init,exit}_inode_cache Gao Xiang 2019-09-04 2:08 ` [PATCH v2 09/25] erofs: use erofs_inode naming Gao Xiang 2019-09-04 2:08 ` [PATCH v2 10/25] erofs: update erofs_fs.h comments Gao Xiang 2019-09-04 2:08 ` [PATCH v2 11/25] erofs: update comments in inode.c Gao Xiang 2019-09-04 2:08 ` [PATCH v2 12/25] erofs: better erofs symlink stuffs Gao Xiang 2019-09-04 2:09 ` [PATCH v2 13/25] erofs: use dsb instead of layout for ondisk super_block Gao Xiang 2019-09-04 2:09 ` [PATCH v2 14/25] erofs: kill verbose debug info in erofs_fill_super Gao Xiang 2019-09-04 2:09 ` [PATCH v2 15/25] erofs: localize erofs_grab_bio() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 16/25] erofs: kill prio and nofail of erofs_get_meta_page() Gao Xiang 2019-09-04 2:09 ` Gao Xiang [this message] 2019-09-04 2:09 ` [PATCH v2 18/25] erofs: add "erofs_" prefix for common and short functions Gao Xiang 2019-09-04 2:09 ` [PATCH v2 19/25] erofs: kill all erofs specific fault injection Gao Xiang 2019-09-04 2:09 ` [PATCH v2 20/25] erofs: kill use_vmap module parameter Gao Xiang 2019-09-04 2:09 ` [PATCH v2 21/25] erofs: save one level of indentation Gao Xiang 2019-09-04 2:09 ` [PATCH v2 22/25] erofs: rename errln/infoln/debugln to erofs_{err, info, dbg} Gao Xiang 2019-09-04 2:09 ` [PATCH v2 23/25] erofs: use read_mapping_page instead of sb_bread Gao Xiang 2019-09-04 2:09 ` [PATCH v2 24/25] erofs: always use iget5_locked Gao Xiang 2019-09-04 2:09 ` [PATCH v2 25/25] erofs: use read_cache_page_gfp for erofs_get_meta_page Gao Xiang 2019-09-04 3:27 ` [PATCH v2 00/25] erofs: patchset addressing Christoph's comments Chao Yu 2019-09-05 1:03 ` Gao Xiang via Linux-erofs 2019-09-05 11:30 ` Christoph Hellwig 2019-09-04 5:16 ` Christoph Hellwig 2019-09-04 6:08 ` Gao Xiang via Linux-erofs
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190904020912.63925-18-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@linuxfoundation.org \ --cc=hch@lst.de \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=miaoxie@huawei.com \ --cc=yuchao0@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-EROFS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-erofs/0 linux-erofs/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-erofs linux-erofs/ https://lore.kernel.org/linux-erofs \ linux-erofs@lists.ozlabs.org linux-erofs@ozlabs.org public-inbox-index linux-erofs Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.ozlabs.lists.linux-erofs AGPL code for this site: git clone https://public-inbox.org/public-inbox.git