fs: Drop mapping_metadata_bhs from address space

Nobody uses mapping_metadata_bhs in struct address_space anymore. Just
remove it and with it all helper functions using it.

Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20260326095354.16340-83-jack@suse.cz
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/inode.c b/fs/inode.c
index 3874b933abdbcb539990236a9c550da4ff1e9ba0..d5774e627a9cdc24b27fcf96c6f75bbfe0a570cd 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -276,7 +276,6 @@ int inode_init_always_gfp(struct super_block *sb, struct inode *inode, gfp_t gfp
 
        mapping->a_ops = &empty_aops;
        mapping->host = inode;
-       mapping->i_metadata_bhs.mapping = mapping;
        mapping->flags = 0;
        mapping->wb_err = 0;
        atomic_set(&mapping->i_mmap_writable, 0);
@@ -484,8 +483,6 @@ static void __address_space_init_once(struct address_space *mapping)
        init_rwsem(&mapping->i_mmap_rwsem);
        INIT_LIST_HEAD(&mapping->i_private_list);
        spin_lock_init(&mapping->i_private_lock);
-       spin_lock_init(&mapping->i_metadata_bhs.lock);
-       INIT_LIST_HEAD(&mapping->i_metadata_bhs.list);
        mapping->i_mmap = RB_ROOT_CACHED;
 }
 

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index e207dcca7a25b5169e62b2f05d9aaabfdae107b2..e4939e33b4b514a4f20bdb41315227902e1bc0c8 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -207,28 +207,10 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate);
 
 /* Things to do with metadata buffers list */
 void mmb_mark_buffer_dirty(struct buffer_head *bh, struct mapping_metadata_bhs *mmb);
-static inline void mark_buffer_dirty_inode(struct buffer_head *bh,
-                                          struct inode *inode)
-{
-       mmb_mark_buffer_dirty(bh, &inode->i_data.i_metadata_bhs);
-}
 int mmb_fsync_noflush(struct file *file, struct mapping_metadata_bhs *mmb,
                      loff_t start, loff_t end, bool datasync);
-static inline int generic_buffers_fsync_noflush(struct file *file,
-                                               loff_t start, loff_t end,
-                                               bool datasync)
-{
-       return mmb_fsync_noflush(file, &file->f_mapping->i_metadata_bhs,
-                                start, end, datasync);
-}
 int mmb_fsync(struct file *file, struct mapping_metadata_bhs *mmb,
              loff_t start, loff_t end, bool datasync);
-static inline int generic_buffers_fsync(struct file *file,
-                                       loff_t start, loff_t end, bool datasync)
-{
-       return mmb_fsync(file, &file->f_mapping->i_metadata_bhs,
-                        start, end, datasync);
-}
 void clean_bdev_aliases(struct block_device *bdev, sector_t block,
                        sector_t len);
 static inline void clean_bdev_bh_alias(struct buffer_head *bh)
@@ -537,14 +519,6 @@ void mmb_init(struct mapping_metadata_bhs *mmb, struct address_space *mapping);
 bool mmb_has_buffers(struct mapping_metadata_bhs *mmb);
 void mmb_invalidate(struct mapping_metadata_bhs *mmb);
 int mmb_sync(struct mapping_metadata_bhs *mmb);
-static inline void invalidate_inode_buffers(struct inode *inode)
-{
-       mmb_invalidate(&inode->i_data.i_metadata_bhs);
-}
-static inline int sync_mapping_buffers(struct address_space *mapping)
-{
-       return mmb_sync(&mapping->i_metadata_bhs);
-}
 void invalidate_bh_lrus(void);
 void invalidate_bh_lrus_cpu(void);
 bool has_bh_in_lru(int cpu, void *dummy);
@@ -555,8 +529,6 @@ extern int buffer_heads_over_limit;
 static inline void buffer_init(void) {}
 static inline bool try_to_free_buffers(struct folio *folio) { return true; }
 static inline int mmb_sync(struct mapping_metadata_bhs *mmb) { return 0; }
-static inline void invalidate_inode_buffers(struct inode *inode) {}
-static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
 static inline void invalidate_bh_lrus(void) {}
 static inline void invalidate_bh_lrus_cpu(void) {}
 static inline bool has_bh_in_lru(int cpu, void *dummy) { return false; }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index fa2a812bd718d1010aebacc138d3f022044e85a4..ccfa696253c8ff054222f5af4351f107eee71efc 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -491,7 +491,6 @@ struct address_space {
        errseq_t                wb_err;
        spinlock_t              i_private_lock;
        struct list_head        i_private_list;
-       struct mapping_metadata_bhs i_metadata_bhs;
        struct rw_semaphore     i_mmap_rwsem;
 } __attribute__((aligned(sizeof(long)))) __randomize_layout;
        /*