mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
btrfs: fix dirty_metadata_bytes for redirtied buffers
commitf18cc97845
upstream. dirty_metadata_bytes is decremented in both places that clear the dirty bit in a buffer, but only incremented in btrfs_mark_buffer_dirty, which means that a buffer that is redirtied using btrfs_redirty_list_add won't be added to dirty_metadata_bytes, but it will be subtracted when written out, leading an inconsistency in the counter. Move the dirty_metadata_bytes from btrfs_mark_buffer_dirty into set_extent_buffer_dirty to also account for the redirty case, and remove the now unused set_extent_buffer_dirty return value. Fixes:d3575156f6
("btrfs: zoned: redirty released extent buffers") CC: stable@vger.kernel.org # 5.15+ Reviewed-by: Naohiro Aota <naohiro.aota@wdc.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1b532748ba
commit
1ea89213cd
3 changed files with 6 additions and 10 deletions
|
@ -4683,7 +4683,6 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
|
|||
{
|
||||
struct btrfs_fs_info *fs_info = buf->fs_info;
|
||||
u64 transid = btrfs_header_generation(buf);
|
||||
int was_dirty;
|
||||
|
||||
#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
|
||||
/*
|
||||
|
@ -4698,11 +4697,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
|
|||
if (transid != fs_info->generation)
|
||||
WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, found %llu running %llu\n",
|
||||
buf->start, transid, fs_info->generation);
|
||||
was_dirty = set_extent_buffer_dirty(buf);
|
||||
if (!was_dirty)
|
||||
percpu_counter_add_batch(&fs_info->dirty_metadata_bytes,
|
||||
buf->len,
|
||||
fs_info->dirty_metadata_batch);
|
||||
set_extent_buffer_dirty(buf);
|
||||
#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
|
||||
/*
|
||||
* Since btrfs_mark_buffer_dirty() can be called with item pointer set
|
||||
|
|
|
@ -4064,7 +4064,7 @@ void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,
|
|||
WARN_ON(atomic_read(&eb->refs) == 0);
|
||||
}
|
||||
|
||||
bool set_extent_buffer_dirty(struct extent_buffer *eb)
|
||||
void set_extent_buffer_dirty(struct extent_buffer *eb)
|
||||
{
|
||||
int i;
|
||||
int num_pages;
|
||||
|
@ -4099,13 +4099,14 @@ bool set_extent_buffer_dirty(struct extent_buffer *eb)
|
|||
eb->start, eb->len);
|
||||
if (subpage)
|
||||
unlock_page(eb->pages[0]);
|
||||
percpu_counter_add_batch(&eb->fs_info->dirty_metadata_bytes,
|
||||
eb->len,
|
||||
eb->fs_info->dirty_metadata_batch);
|
||||
}
|
||||
#ifdef CONFIG_BTRFS_DEBUG
|
||||
for (i = 0; i < num_pages; i++)
|
||||
ASSERT(PageDirty(eb->pages[i]));
|
||||
#endif
|
||||
|
||||
return was_dirty;
|
||||
}
|
||||
|
||||
void clear_extent_buffer_uptodate(struct extent_buffer *eb)
|
||||
|
|
|
@ -263,7 +263,7 @@ void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long star
|
|||
void extent_buffer_bitmap_clear(const struct extent_buffer *eb,
|
||||
unsigned long start, unsigned long pos,
|
||||
unsigned long len);
|
||||
bool set_extent_buffer_dirty(struct extent_buffer *eb);
|
||||
void set_extent_buffer_dirty(struct extent_buffer *eb);
|
||||
void set_extent_buffer_uptodate(struct extent_buffer *eb);
|
||||
void clear_extent_buffer_uptodate(struct extent_buffer *eb);
|
||||
int extent_buffer_under_io(const struct extent_buffer *eb);
|
||||
|
|
Loading…
Reference in a new issue