Skip to content

extent buffer dirty cleanups

Josef Bacik linux-btrfs 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest7 patches 2 repliesIn review
  2. v29 patches 2 repliesSuperseded
  3. v18 patches 8 repliesSuperseded

Changes in v3 from the cover letter

- Reworked the logic around clearing dirty on extent buffers not in our transaction. We do need this for update_ref_for_cow in some cases that I didn't account for. I've expanded the logic for this make it more idiot proof, and adjusted all of the patches accordingly.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7btrfs: always lock the block before calling btrfs_clean_tree_blockfs/btrfs/extent-tree.c+1 -20 replies
2/7btrfs: add trans argument to btrfs_clean_tree_blockfs/btrfs/ctree.c fs/btrfs/disk-io.c fs/btrfs/disk-io.h +5 more+29 -270 replies
3/7btrfs: replace clearing extent buffer dirty bit with btrfs_clean_blockfs/btrfs/disk-io.c fs/btrfs/tree-log.c+21 -240 replies
4/7btrfs: do not increment dirty_metadata_bytes in set_btree_ioerrfs/btrfs/extent_io.c+0 -70 replies
5/7btrfs: rename btrfs_clean_tree_block => btrfs_clear_buffer_dirtyfs/btrfs/ctree.c fs/btrfs/disk-io.c fs/btrfs/disk-io.h +5 more+22 -220 replies
6/7btrfs: combine btrfs_clear_buffer_dirty and clear_extent_buffer_dirtyfs/btrfs/disk-io.c fs/btrfs/extent_io.c fs/btrfs/extent_io.h+19 -180 replies
7/7btrfs: remove btrfs_wait_tree_block_writebackfs/btrfs/tree-log.c+3 -90 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/7] extent buffer dirty cleanups

v2->v3:
- Reworked the logic around clearing dirty on extent buffers not in our transaction. We do need this for update_ref_for_cow in some cases that I didn't account for. I've expanded the logic for this make it more idiot proof, and adjusted all of the patches accordingly.

v1->v2:
- Added "btrfs: do not call btrfs_clean_tree_block in update_ref_for_cow", Qu noticed some corruption with the original patchset, this turned out to be because we were clearing the extent buffer dirty at cow time, which doesn't make sense as we're not free'ing the current block in our current transaction.

--- Original email ---
Hello,

While sync'ing ctree.c to btrfs-progs I noticed we have some oddities when it comes to how we deal with the extent buffer being dirty. We have btrfs_clean_tree_block, which is sort of meant to be run against extent buffers we've modified in this transaction. However we have some other places where we've open coded the same work without the generation check. This makes it kind of confusing, and is inconsistent with how we deal with the fs_info->dirty_metadata_bytes.

So clean this stuff up so we have one helper we use for setting the extent buffer dirty (btrfs_mark_buffer_dirty) and one for clearing dirty (btrfs_clear_buffer_dirty). This makes everything more consistent and clean across the board. I've additionally cleaned up a random writeback thing we had in tree-log that I noticed while doing these cleanups. Thanks,

Josef

Josef Bacik (7):
btrfs: always lock the block before calling btrfs_clean_tree_block
btrfs: add trans argument to btrfs_clean_tree_block
btrfs: replace clearing extent buffer dirty bit with btrfs_clean_block
btrfs: do not increment dirty_metadata_bytes in set_btree_ioerr
btrfs: rename btrfs_clean_tree_block => btrfs_clear_buffer_dirty
btrfs: combine btrfs_clear_buffer_dirty and clear_extent_buffer_dirty
btrfs: remove btrfs_wait_tree_block_writeback

 fs/btrfs/ctree.c           | 31 +++++++++++++++--------------
 fs/btrfs/disk-io.c         | 25 +++++-------------------
 fs/btrfs/disk-io.h         |  3 ++-
 fs/btrfs/extent-tree.c     |  9 ++++-----
 fs/btrfs/extent_io.c       | 23 ++++++++++++++--------
 fs/btrfs/extent_io.h       |  5 ++++-
 fs/btrfs/free-space-tree.c |  2 +-
 fs/btrfs/ioctl.c           |  2 +-
 fs/btrfs/qgroup.c          |  2 +-
 fs/btrfs/tree-log.c        | 40 ++++++++++++++------------------------
 10 files changed, 64 insertions(+), 78 deletions(-)
Signature · 1 line
2.26.3