Commit 782598ec authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'zonefs-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs

Pull zonefs fix from Damien Le Moal:
 "A single patch in this pull request to fix a BIO and page reference
  leak when writing sequential zone files"

* tag 'zonefs-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
  zonefs: fix page reference and BIO leak
parents b7906b70 6bea0225
...@@ -691,21 +691,23 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from) ...@@ -691,21 +691,23 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
bio->bi_opf |= REQ_FUA; bio->bi_opf |= REQ_FUA;
ret = bio_iov_iter_get_pages(bio, from); ret = bio_iov_iter_get_pages(bio, from);
if (unlikely(ret)) { if (unlikely(ret))
bio_io_error(bio); goto out_release;
return ret;
}
size = bio->bi_iter.bi_size; size = bio->bi_iter.bi_size;
task_io_account_write(ret); task_io_account_write(size);
if (iocb->ki_flags & IOCB_HIPRI) if (iocb->ki_flags & IOCB_HIPRI)
bio_set_polled(bio, iocb); bio_set_polled(bio, iocb);
ret = submit_bio_wait(bio); ret = submit_bio_wait(bio);
zonefs_file_write_dio_end_io(iocb, size, ret, 0);
out_release:
bio_release_pages(bio, false);
bio_put(bio); bio_put(bio);
zonefs_file_write_dio_end_io(iocb, size, ret, 0);
if (ret >= 0) { if (ret >= 0) {
iocb->ki_pos += size; iocb->ki_pos += size;
return size; return size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment