hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfs: simplify xfs_chain_bio 

Move setting up operation and write hint to xfs_alloc_ioend, and
then just copy over all needed information from the previous bio
in xfs_chain_bio and stop passing various parameters to it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2019-06-28 19:30:22 -07:00 committed by Darrick J. Wong
parent f327a00745
commit a247373596
1 changed files with 17 additions and 18 deletions

35
fs/xfs/xfs_aops.c
View File

@ -665,7 +665,6 @@ xfs_submit_ioend(
ioend->io_bio->bi_private = ioend; ioend->io_bio->bi_private = ioend;
ioend->io_bio->bi_end_io = xfs_end_bio; ioend->io_bio->bi_end_io = xfs_end_bio;
ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
/* /*
* If we are failing the IO now, just mark the ioend with an * If we are failing the IO now, just mark the ioend with an
@ -679,7 +678,6 @@ xfs_submit_ioend(
return status; return status;
} }
ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
submit_bio(ioend->io_bio); submit_bio(ioend->io_bio);
return 0; return 0;
} }
@ -691,7 +689,8 @@ xfs_alloc_ioend(
xfs_exntst_t state, xfs_exntst_t state,
xfs_off_t offset, xfs_off_t offset,
struct block_device *bdev, struct block_device *bdev,
sector_t sector) sector_t sector,
struct writeback_control *wbc)
{ {
struct xfs_ioend *ioend; struct xfs_ioend *ioend;
struct bio *bio; struct bio *bio;
@ -699,6 +698,8 @@ xfs_alloc_ioend(
bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset); bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
bio_set_dev(bio, bdev); bio_set_dev(bio, bdev);
bio->bi_iter.bi_sector = sector; bio->bi_iter.bi_sector = sector;
bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
bio->bi_write_hint = inode->i_write_hint;
ioend = container_of(bio, struct xfs_ioend, io_inline_bio); ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
INIT_LIST_HEAD(&ioend->io_list); INIT_LIST_HEAD(&ioend->io_list);
@ -719,24 +720,22 @@ xfs_alloc_ioend(
* so that the bi_private linkage is set up in the right direction for the * so that the bi_private linkage is set up in the right direction for the
* traversal in xfs_destroy_ioend(). * traversal in xfs_destroy_ioend().
*/ */
static void static struct bio *
xfs_chain_bio( xfs_chain_bio(
struct xfs_ioend *ioend, struct bio *prev)
struct writeback_control *wbc,
struct block_device *bdev,
sector_t sector)
{ {
struct bio *new; struct bio *new;
new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES); new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
bio_set_dev(new, bdev); bio_copy_dev(new, prev);
new->bi_iter.bi_sector = sector; new->bi_iter.bi_sector = bio_end_sector(prev);
bio_chain(ioend->io_bio, new); new->bi_opf = prev->bi_opf;
bio_get(ioend->io_bio); /* for xfs_destroy_ioend */ new->bi_write_hint = prev->bi_write_hint;
ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint; bio_chain(prev, new);
submit_bio(ioend->io_bio); bio_get(prev); /* for xfs_destroy_ioend */
ioend->io_bio = new; submit_bio(prev);
return new;
} }
/* /*
@ -771,14 +770,14 @@ xfs_add_to_ioend(
if (wpc->ioend) if (wpc->ioend)
list_add(&wpc->ioend->io_list, iolist); list_add(&wpc->ioend->io_list, iolist);
wpc->ioend = xfs_alloc_ioend(inode, wpc->fork, wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
wpc->imap.br_state, offset, bdev, sector); wpc->imap.br_state, offset, bdev, sector, wbc);
} }
if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) { if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) {
if (iop) if (iop)
atomic_inc(&iop->write_count); atomic_inc(&iop->write_count);
if (bio_full(wpc->ioend->io_bio)) if (bio_full(wpc->ioend->io_bio))
xfs_chain_bio(wpc->ioend, wbc, bdev, sector); wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
bio_add_page(wpc->ioend->io_bio, page, len, poff); bio_add_page(wpc->ioend->io_bio, page, len, poff);
} }