diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-24 11:34:07 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-24 11:34:07 -0400 |
| commit | 980f7437e2588d100456640cb863908a3cc6fc77 (patch) | |
| tree | ac19bcb02929770909af3bb6dd44a95da915c0e4 /libbcachefs/fs-io.c | |
| parent | ae43a58d97fc00e31770142da832fb8a249808eb (diff) | |
Update bcachefs sources to 61ebcb532a bcachefs: Fix for allocating before backpointers have been checked
Diffstat (limited to 'libbcachefs/fs-io.c')
| -rw-r--r-- | libbcachefs/fs-io.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libbcachefs/fs-io.c b/libbcachefs/fs-io.c index 706180b9..3900995d 100644 --- a/libbcachefs/fs-io.c +++ b/libbcachefs/fs-io.c @@ -1666,10 +1666,21 @@ static int __bch2_buffered_write(struct bch_inode_info *inode, goto out; } + /* + * XXX: per POSIX and fstests generic/275, on -ENOSPC we're + * supposed to write as much as we have disk space for. + * + * On failure here we should still write out a partial page if + * we aren't completely out of disk space - we don't do that + * yet: + */ ret = bch2_page_reservation_get(c, inode, page, &res, pg_offset, pg_len); - if (ret) - goto out; + if (unlikely(ret)) { + if (!reserved) + goto out; + break; + } reserved += pg_len; } @@ -1678,10 +1689,10 @@ static int __bch2_buffered_write(struct bch_inode_info *inode, for (i = 0; i < nr_pages; i++) flush_dcache_page(pages[i]); - while (copied < len) { + while (copied < reserved) { struct page *page = pages[(offset + copied) >> PAGE_SHIFT]; unsigned pg_offset = (offset + copied) & (PAGE_SIZE - 1); - unsigned pg_len = min_t(unsigned, len - copied, + unsigned pg_len = min_t(unsigned, reserved - copied, PAGE_SIZE - pg_offset); unsigned pg_copied = copy_page_from_iter_atomic(page, pg_offset, pg_len, iter); |