Skip to content

Commit

Permalink
Merge tag 'zonefs-5.10-rc7' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
Linus Torvalds committed Dec 11, 2020
2 parents b7906b7 + 6bea022 commit 782598e
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions fs/zonefs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -691,21 +691,23 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
bio->bi_opf |= REQ_FUA;

ret = bio_iov_iter_get_pages(bio, from);
if (unlikely(ret)) {
bio_io_error(bio);
return ret;
}
if (unlikely(ret))
goto out_release;

size = bio->bi_iter.bi_size;
task_io_account_write(ret);
task_io_account_write(size);

if (iocb->ki_flags & IOCB_HIPRI)
bio_set_polled(bio, iocb);

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);

zonefs_file_write_dio_end_io(iocb, size, ret, 0);
if (ret >= 0) {
iocb->ki_pos += size;
return size;
Expand Down

0 comments on commit 782598e

Please sign in to comment.