Skip to content

fs: Move metadata bh tracking from address_space

Jan Kara gfs2 kvm linux-block linux-ext4 linux-fsdevel linux-mm ntfs3 ocfs2-devel 3 versions – Applied

Status from this message: Applied to the vfs-7.1.bh.metadata branch of the vfs/vfs.git tree.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest42 patches 19 repliesApplied
  2. v241 patches 26 repliesApplied
  3. v132 patches 29 repliesSuperseded

Changes in v3 from the cover letter

* Added Reviewed-by tags from Christoph
* Dropped the patch unifying fsync implementation in fs/libfs.c and fs/buffer.c
* Put fsync locking change into a separate commit
* Reordered series to place all fsync path modifications close together
* Improved some changelogs
* Renamed some functions based on Christoph's feedback

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/42ext4: Use inode_has_buffers()fs/buffer.c fs/ext4/inode.c+2 -40 replies
2/42gfs2: Don't zero i_private_datafs/gfs2/glock.c+0 -10 replies
3/42ntfs3: Drop pointless sync_mapping_buffers() and invalidate_inode_buffers() callsfs/ntfs3/file.c fs/ntfs3/inode.c+0 -40 replies
4/42ocfs2: Drop pointless sync_mapping_buffers() callsfs/ocfs2/dlmglue.c fs/ocfs2/namei.c+0 -40 replies
5/42bdev: Drop pointless invalidate_inode_buffers() callblock/bdev.c+0 -81 reply
6/42ufs: Drop pointless invalidate_mapping_buffers() callfs/ufs/inode.c+0 -10 replies
7/42exfat: Drop pointless invalidate_inode_buffers() callfs/exfat/inode.c+0 -10 replies
8/42fs: Remove inode lock from __generic_file_fsync()fs/libfs.c+0 -21 reply
9/42udf: Switch to generic_buffers_fsync()fs/udf/dir.c fs/udf/file.c+2 -20 replies
10/42minix: Switch to generic_buffers_fsync()fs/minix/dir.c fs/minix/file.c+2 -20 replies
11/42bfs: Switch to generic_buffers_fsync()fs/bfs/dir.c+1 -10 replies
12/42fat: Switch to generic_buffers_fsync_noflush()fs/fat/file.c+1 -10 replies
13/42fs: Drop sync_mapping_buffers() from __generic_file_fsync()fs/libfs.c+2 -71 reply
14/42fs: Rename generic_file_fsync() to simple_fsync()fs/adfs/dir.c fs/adfs/file.c fs/exfat/file.c +7 more+22 -242 replies
15/42fat: Sync and invalidate metadata buffers from fat_evict_inode()fs/fat/inode.c+3 -19 replies
16/42udf: Sync and invalidate metadata buffers from udf_evict_inode()fs/udf/inode.c+2 -00 replies
17/42minix: Sync and invalidate metadata buffers from minix_evict_inode()fs/minix/inode.c+2 -00 replies
18/42ext2: Sync and invalidate metadata buffers from ext2_evict_inode()fs/ext2/inode.c+2 -10 replies
19/42ext4: Sync and invalidate metadata buffers from ext4_evict_inode()fs/ext4/inode.c fs/ext4/super.c+5 -20 replies
20/42bfs: Sync and invalidate metadata buffers from bfs_evict_inode()fs/bfs/inode.c+2 -00 replies
21/42affs: Sync and invalidate metadata buffers from affs_evict_inode()fs/affs/inode.c+2 -00 replies
22/42fs: Ignore inode metadata buffers in inode_lru_isolate()fs/buffer.c fs/inode.c include/linux/buffer_head.h+9 -441 reply
23/42fs: Stop using i_private_data for metadata bh trackingfs/buffer.c+5 -80 replies
24/42hugetlbfs: Stop using i_private_datafs/hugetlbfs/inode.c include/linux/hugetlb.h mm/hugetlb.c+5 -170 replies
25/42aio: Stop using i_private_data and i_private_lockfs/aio.c+66 -120 replies
26/42fs: Remove i_private_datafs/inode.c include/linux/fs.h+0 -30 replies
27/42kvm: Use private inode list instead of i_private_listvirt/kvm/guest_memfd.c+7 -50 replies
28/42fs: Drop osync_buffers_list()fs/buffer.c+2 -410 replies
29/42fs: Fold fsync_buffers_list() into sync_mapping_buffers()fs/buffer.c+80 -1000 replies
30/42fs: Move metadata bhs tracking to a separate structfs/buffer.c fs/inode.c include/linux/fs.h+74 -730 replies
31/42fs: Make bhs point to mapping_metadata_bhsfs/buffer.c fs/inode.c include/linux/buffer_head.h +1 more+20 -200 replies
32/42fs: Switch inode_has_buffers() to take mapping_metadata_bhsfs/buffer.c fs/ext4/inode.c include/linux/buffer_head.h+9 -90 replies
33/42fs: Provide functions for handling mapping_metadata_bhs directlyfs/buffer.c include/linux/buffer_head.h+87 -671 reply
34/42ext2: Track metadata bhs in fs-private inode partfs/ext2/ext2.h fs/ext2/file.c fs/ext2/inode.c +1 more+15 -90 replies
35/42affs: Track metadata bhs in fs-private inode partfs/affs/affs.h fs/affs/amigaffs.c fs/affs/file.c +3 more+35 -280 replies
36/42bfs: Track metadata bhs in fs-private inode partfs/bfs/bfs.h fs/bfs/dir.c fs/bfs/inode.c+17 -60 replies
37/42fat: Track metadata bhs in fs-private inode partfs/fat/dir.c fs/fat/fat.h fs/fat/fatent.c +4 more+34 -200 replies
38/42udf: Track metadata bhs in fs-private inode partfs/udf/dir.c fs/udf/directory.c fs/udf/file.c +6 more+25 -140 replies
39/42minix: Track metadata bhs in fs-private inode partfs/minix/dir.c fs/minix/file.c fs/minix/inode.c +2 more+24 -80 replies
40/42ext4: Track metadata bhs in fs-private inode partfs/ext4/ext4.h fs/ext4/ext4_jbd2.c fs/ext4/fsync.c +2 more+10 -60 replies
41/42fs: Drop mapping_metadata_bhs from address spacefs/inode.c include/linux/buffer_head.h include/linux/fs.h+0 -321 reply
42/42fs: Drop i_private_list from address_spacefs/inode.c include/linux/fs.h+0 -41 reply

Reviews trailers per patch

20 of 42 patches have a Reviewed-by or Acked-by.

PatchAndreas GruenbacherTheodore Ts'oChristoph Hellwig
1/42A-b
2/42R-b
3/42
4/42
5/42R-b
6/42
7/42
8/42R-b
9/42
10/42
11/42
12/42
13/42R-b
14/42
15/42
16/42
17/42
18/42
19/42A-b
20/42
21/42
22/42R-b
23/42R-b
24/42R-b
25/42R-b
26/42R-b
27/42R-b
28/42R-b
29/42R-b
30/42R-b
31/42R-b
32/42R-b
33/42R-b
34/42
35/42
36/42
37/42
38/42
39/42
40/42
41/42R-b
42/42R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/42] fs: Move metadata bh tracking from address_space

Hello,

here is a next revision of the patchset cleaning up buffer head metadata tracking and use of address_space's private_list and private_lock. Functionally this should be identical to v2, most of the changes were in improving changelogs, patch ordering, function names, etc. The patches have survived some testing with fstests and ltp however I didn't test AFFS and KVM guest_memfd changes so a help with testing those would be very welcome. Thanks.

Changes since v2:
* Added Reviewed-by tags from Christoph
* Dropped the patch unifying fsync implementation in fs/libfs.c and fs/buffer.c
* Put fsync locking change into a separate commit
* Reordered series to place all fsync path modifications close together
* Improved some changelogs
* Renamed some functions based on Christoph's feedback

Changes since v1:
* Fixed hugetlbfs handling of root directory
* Reworked mapping_metadata_bhs handling functions to get the tracking structure as an argument so we now don't need iops method to fetch the struct from the inode
* Reordered patches into more sensible order
* Added patch to merge two mostly duplicate generic fsync implementations
* Added Reviewed-by tags
* Couple more minor changes that were requested during review

Original cover letter:

this patch series cleans up the mess that has accumulated over the years in metadata buffer_head tracking for inodes, moves the tracking into dedicated structure in filesystem-private part of the inode (so that we don't use private_list, private_data, and private_lock in struct address_space), and also moves couple other users of private_data and private_list so these are removed from struct address_space saving 3 longs in struct inode for 99% of inodes. I would like to get rid of private_lock in struct address_space as well however the locking changes for buffer_heads are non-trivial there and the patch series is long enough as is. So let's leave that for another time.

 block/bdev.c                |    1 
 fs/affs/affs.h              |    2 
 fs/affs/dir.c               |    1 
 fs/affs/file.c              |    1 
 fs/affs/inode.c             |    2 
 fs/affs/super.c             |    6 
 fs/affs/symlink.c           |    1 
 fs/aio.c                    |   78 +++++++-
 fs/bfs/bfs.h                |    2 
 fs/bfs/dir.c                |    1 
 fs/bfs/file.c               |    4 
 fs/bfs/inode.c              |    9 +
 fs/buffer.c                 |  387 +++++++++++++++++---------------------------
 fs/ext2/ext2.h              |    2 
 fs/ext2/file.c              |    1 
 fs/ext2/inode.c             |    3 
 fs/ext2/namei.c             |    2 
 fs/ext2/super.c             |    6 
 fs/ext2/symlink.c           |    2 
 fs/ext4/ext4.h              |    4 
 fs/ext4/file.c              |    1 
 fs/ext4/inode.c             |    9 -
 fs/ext4/namei.c             |    2 
 fs/ext4/super.c             |    9 -
 fs/ext4/symlink.c           |    3 
 fs/fat/fat.h                |    2 
 fs/fat/file.c               |    1 
 fs/fat/inode.c              |   16 +
 fs/fat/namei_msdos.c        |    1 
 fs/fat/namei_vfat.c         |    1 
 fs/gfs2/glock.c             |    1 
 fs/hugetlbfs/inode.c        |   10 -
 fs/inode.c                  |   24 +-
 fs/minix/file.c             |    1 
 fs/minix/inode.c            |   10 +
 fs/minix/minix.h            |    2 
 fs/minix/namei.c            |    1 
 fs/ntfs3/file.c             |    3 
 fs/ocfs2/dlmglue.c          |    1 
 fs/ocfs2/namei.c            |    3 
 fs/udf/file.c               |    1 
 fs/udf/inode.c              |    2 
 fs/udf/namei.c              |    1 
 fs/udf/super.c              |    6 
 fs/udf/symlink.c            |    1 
 fs/udf/udf_i.h              |    1 
 fs/udf/udfdecl.h            |    1 
 include/linux/buffer_head.h |    6 
 include/linux/fs.h          |   11 -
 include/linux/hugetlb.h     |    1 
 mm/hugetlb.c                |   10 -
 virt/kvm/guest_memfd.c      |   12 -
 52 files changed, 360 insertions(+), 309 deletions(-)

Honza

Previous versions: