GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: logfs: use bio_add_page() in __bdev_writeseg()

Browse source 
Also this patch simplify the code a bit.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Ming Lei 2016-11-11 20:05:38 +08:00 • committed by Jens Axboe
parent 739a997546
commit d4f98a89f9
1 changed files with 20 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

51
fs/logfs/dev_bdev.c
View file

@ -71,56 +71,45 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index,
{ {
struct logfs_super *super = logfs_super(sb); struct logfs_super *super = logfs_super(sb);
struct address_space *mapping = super->s_mapping_inode->i_mapping; struct address_space *mapping = super->s_mapping_inode->i_mapping;
struct bio *bio; struct bio *bio = NULL;
struct page *page; struct page *page;
unsigned int max_pages; unsigned int max_pages;
int i; int i, ret;
max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES); max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES);
bio = bio_alloc(GFP_NOFS, max_pages);
BUG_ON(!bio);
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
if (i >= max_pages) { if (!bio) {
/* Block layer cannot split bios :( */ bio = bio_alloc(GFP_NOFS, max_pages);
bio->bi_vcnt = i; BUG_ON(!bio);
bio->bi_iter.bi_size = i * PAGE_SIZE;
bio->bi_bdev = super->s_bdev; bio->bi_bdev = super->s_bdev;
bio->bi_iter.bi_sector = ofs >> 9; bio->bi_iter.bi_sector = ofs >> 9;
bio->bi_private = sb; bio->bi_private = sb;
bio->bi_end_io = writeseg_end_io; bio->bi_end_io = writeseg_end_io;
bio_set_op_attrs(bio, REQ_OP_WRITE, 0); bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
atomic_inc(&super->s_pending_writes);
submit_bio(bio);
ofs += i * PAGE_SIZE;
index += i;
nr_pages -= i;
i = 0;
bio = bio_alloc(GFP_NOFS, max_pages);
BUG_ON(!bio);
} }
page = find_lock_page(mapping, index + i); page = find_lock_page(mapping, index + i);
BUG_ON(!page); BUG_ON(!page);
bio->bi_io_vec[i].bv_page = page; ret = bio_add_page(bio, page, PAGE_SIZE, 0);
bio->bi_io_vec[i].bv_len = PAGE_SIZE;
bio->bi_io_vec[i].bv_offset = 0;
BUG_ON(PageWriteback(page)); BUG_ON(PageWriteback(page));
set_page_writeback(page); set_page_writeback(page);
unlock_page(page); unlock_page(page);
if (!ret) {
/* Block layer cannot split bios :( */
ofs += bio->bi_iter.bi_size;
atomic_inc(&super->s_pending_writes);
submit_bio(bio);
bio = NULL;
}
}
if (bio) {
atomic_inc(&super->s_pending_writes);
submit_bio(bio);
} }
bio->bi_vcnt = nr_pages;
bio->bi_iter.bi_size = nr_pages * PAGE_SIZE;
bio->bi_bdev = super->s_bdev;
bio->bi_iter.bi_sector = ofs >> 9;
bio->bi_private = sb;
bio->bi_end_io = writeseg_end_io;
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
atomic_inc(&super->s_pending_writes);
submit_bio(bio);
return 0; return 0;
} }