From: Josef Bacik <josef@toxicpanda.com>
To: kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: [PATCH 33/36] btrfs: only free reserved extent if we didn't insert it
Date: Tue, 11 Sep 2018 13:58:04 -0400 [thread overview]
Message-ID: <20180911175807.26181-34-josef@toxicpanda.com> (raw)
In-Reply-To: <20180911175807.26181-1-josef@toxicpanda.com>
When we insert the file extent once the ordered extent completes we free
the reserved extent reservation as it'll have been migrated to the
bytes_used counter. However if we error out after this step we'll still
clear the reserved extent reservation, resulting in a negative
accounting of the reserved bytes for the block group and space info.
Fix this by only doing the free if we didn't successfully insert a file
extent for this extent.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/inode.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 60bcad901857..fd6ade4680b5 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2992,6 +2992,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
bool truncated = false;
bool range_locked = false;
bool clear_new_delalloc_bytes = false;
+ bool clear_reserved_extent = true;
if (!test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) &&
!test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags) &&
@@ -3095,10 +3096,12 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
logical_len, logical_len,
compress_type, 0, 0,
BTRFS_FILE_EXTENT_REG);
- if (!ret)
+ if (!ret) {
+ clear_reserved_extent = false;
btrfs_release_delalloc_bytes(fs_info,
ordered_extent->start,
ordered_extent->disk_len);
+ }
}
unpin_extent_cache(&BTRFS_I(inode)->extent_tree,
ordered_extent->file_offset, ordered_extent->len,
@@ -3159,8 +3162,13 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
* wrong we need to return the space for this ordered extent
* back to the allocator. We only free the extent in the
* truncated case if we didn't write out the extent at all.
+ *
+ * If we made it past insert_reserved_file_extent before we
+ * errored out then we don't need to do this as the accounting
+ * has already been done.
*/
if ((ret || !logical_len) &&
+ clear_reserved_extent &&
!test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) &&
!test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags))
btrfs_free_reserved_extent(fs_info,
--
2.14.3
next prev parent reply other threads:[~2018-09-11 22:59 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 17:57 [PATCH 00/35][v2] My current patch queue Josef Bacik
2018-09-11 17:57 ` [PATCH 01/36] btrfs: add btrfs_delete_ref_head helper Josef Bacik
2018-09-11 22:52 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 02/36] btrfs: add cleanup_ref_head_accounting helper Josef Bacik
2018-09-11 17:57 ` [PATCH 03/36] btrfs: cleanup extent_op handling Josef Bacik
2018-09-11 23:24 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 04/36] btrfs: only track ref_heads in delayed_ref_updates Josef Bacik
2018-09-11 17:57 ` [PATCH 05/36] btrfs: only count ref heads run in __btrfs_run_delayed_refs Josef Bacik
2018-09-11 23:07 ` Omar Sandoval
2018-09-12 17:46 ` David Sterba
2018-09-11 17:57 ` [PATCH 06/36] btrfs: introduce delayed_refs_rsv Josef Bacik
2018-09-11 17:57 ` [PATCH 07/36] btrfs: check if free bgs for commit Josef Bacik
2018-09-11 23:09 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 08/36] btrfs: dump block_rsv whe dumping space info Josef Bacik
2018-09-11 23:11 ` Omar Sandoval
2018-09-12 17:24 ` David Sterba
2018-09-11 17:57 ` [PATCH 09/36] btrfs: release metadata before running delayed refs Josef Bacik
2018-09-11 17:57 ` [PATCH 10/36] btrfs: protect space cache inode alloc with nofs Josef Bacik
2018-09-11 17:57 ` [PATCH 11/36] btrfs: fix truncate throttling Josef Bacik
2018-09-11 17:57 ` [PATCH 12/36] btrfs: don't use global rsv for chunk allocation Josef Bacik
2018-09-11 17:57 ` [PATCH 13/36] btrfs: add ALLOC_CHUNK_FORCE to the flushing code Josef Bacik
2018-09-11 17:57 ` [PATCH 14/36] btrfs: reset max_extent_size properly Josef Bacik
2018-09-18 23:54 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 15/36] btrfs: don't enospc all tickets on flush failure Josef Bacik
2018-09-11 17:57 ` [PATCH 16/36] btrfs: run delayed iputs before committing Josef Bacik
2018-09-18 23:59 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 17/36] btrfs: loop in inode_rsv_refill Josef Bacik
2018-09-19 0:17 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 18/36] btrfs: move the dio_sem higher up the callchain Josef Bacik
2018-09-11 17:57 ` [PATCH 19/36] btrfs: set max_extent_size properly Josef Bacik
2018-09-11 17:57 ` [PATCH 20/36] btrfs: don't use ctl->free_space for max_extent_size Josef Bacik
2018-09-11 17:57 ` [PATCH 21/36] btrfs: reset max_extent_size on clear in a bitmap Josef Bacik
2018-09-11 17:57 ` [PATCH 22/36] btrfs: only run delayed refs if we're committing Josef Bacik
2018-09-11 17:57 ` [PATCH 23/36] btrfs: make sure we create all new bgs Josef Bacik
2018-09-11 17:57 ` [PATCH 24/36] btrfs: assert on non-empty delayed iputs Josef Bacik
2018-09-11 17:57 ` [PATCH 25/36] btrfs: pass delayed_refs_root to btrfs_delayed_ref_lock Josef Bacik
2018-09-11 17:57 ` [PATCH 26/36] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock Josef Bacik
2018-09-11 17:57 ` [PATCH 27/36] btrfs: make btrfs_destroy_delayed_refs use btrfs_delete_ref_head Josef Bacik
2018-09-11 17:57 ` [PATCH 28/36] btrfs: handle delayed ref head accounting cleanup in abort Josef Bacik
2018-09-11 17:58 ` [PATCH 29/36] btrfs: call btrfs_create_pending_block_groups unconditionally Josef Bacik
2018-09-11 17:58 ` [PATCH 30/36] btrfs: just delete pending bgs if we are aborted Josef Bacik
2018-09-11 17:58 ` [PATCH 31/36] btrfs: cleanup pending bgs on transaction abort Josef Bacik
2018-09-11 17:58 ` [PATCH 32/36] btrfs: clear delayed_refs_rsv for dirty bg cleanup Josef Bacik
2018-09-19 0:21 ` Omar Sandoval
2018-09-11 17:58 ` Josef Bacik [this message]
2018-09-19 0:20 ` [PATCH 33/36] btrfs: only free reserved extent if we didn't insert it Omar Sandoval
2018-09-11 17:58 ` [PATCH 34/36] btrfs: fix insert_reserved error handling Josef Bacik
2018-09-11 17:58 ` [PATCH 35/36] btrfs: wait on ordered extents on abort cleanup Josef Bacik
2018-09-11 17:58 ` [PATCH 36/36] MAINTAINERS: update my email address for btrfs Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180911175807.26181-34-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).