erofs: kill __submit_bio()
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> Link: https://lore.kernel.org/r/20190904020912.63925-18-gaoxiang25@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
e655b5b3a2
Коммит
94e4e153b1
|
@ -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 @@ repeat:
|
|||
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 @@ submit_bio_retry:
|
|||
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 @@ has_updated:
|
|||
/* 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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1258,7 +1258,7 @@ repeat:
|
|||
|
||||
if (bio && force_submit) {
|
||||
submit_bio_retry:
|
||||
__submit_bio(bio, REQ_OP_READ, 0);
|
||||
submit_bio(bio);
|
||||
bio = NULL;
|
||||
}
|
||||
|
||||
|
@ -1270,6 +1270,8 @@ submit_bio_retry:
|
|||
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 @@ skippage:
|
|||
} 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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче