tdm
/
cbd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bio_chain instead of rolling our own

This commit is contained in:
Tom Marshall 2019-11-17 04:59:54 +01:00
parent 79eaf7dc7c
commit f1bb01ab48
1 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dm-compress/util.c
View File

@ -230,53 +230,21 @@ pblk_write(struct compress_params* kparams,
submit_bio(bio);
}
struct pblk_iov
{
struct compress_params* kparams;
atomic_t remain;
};
void
pblk_writev_endio(struct bio* bio)
{
struct pblk_iov* iov = bio->bi_private;
struct compress_params* kparams = iov->kparams;
struct page* page = bio->bi_io_vec[0].bv_page;
if (bio->bi_status != BLK_STS_OK) {
printk(KERN_ERR "%s: I/O error\n", __func__);
kparams->params.flags |= CBD_FLAG_ERROR;
SetPageError(page);
}
if (atomic_dec_and_test(&iov->remain)) {
ClearPageDirty(page);
unlock_page(page);
kfree(iov);
}
bio_put(bio);
}
void
pblk_writev(struct compress_params* kparams,
u64* pblkv, u32 count, struct page* page)
{
u32 pblk_len = pblk_size(&kparams->params);
struct pblk_iov* iov;
u32 idx;
u32 page_off;
u32 nr_bio;
u64 pblk;
u32 iov_nr_pblk;
struct bio* parent_bio;
struct bio* bio;
BUG_ON(pblk_len * count > PAGE_SIZE);
iov = kmalloc(sizeof(struct pblk_iov), GFP_KERNEL);
if (!iov) {
printk(KERN_ERR "%s: out of memory\n", __func__);
goto err;
}
iov->kparams = kparams;
atomic_set(&iov->remain, count);
parent_bio = NULL;
idx = 0;
page_off = 0;
nr_bio = 0;
@ -292,25 +260,29 @@ pblk_writev(struct compress_params* kparams,
pblk_len, pblk, iov_nr_pblk, page, page_off);
if (!bio) {
printk(KERN_ERR "%s: out of memory\n", __func__);
goto err_free;
goto err;
}
if (!parent_bio) {
bio->bi_end_io = pblk_write_endio;
bio->bi_private = kparams;
parent_bio = bio;
}
else {
bio_chain(bio, parent_bio);
parent_bio = bio;
}
++nr_bio;
bio->bi_end_io = pblk_writev_endio;
bio->bi_private = iov;
submit_bio(bio);
page_off += pblk_len * iov_nr_pblk;
}
if (atomic_sub_and_test(count - nr_bio, &iov->remain)) {
ClearPageDirty(page);
unlock_page(page);
kfree(iov);
submit_bio(bio);
}
return;
err_free:
kfree(iov);
err:
while (parent_bio) {
bio = parent_bio;
parent_bio = bio->bi_private;
bio_put(bio);
}
kparams->params.flags |= CBD_FLAG_ERROR;
SetPageError(page);
unlock_page(page);