Skip to content

Commit cb6d109

Browse files
jankarabrauner
authored andcommitted
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>
1 parent 41189b4 commit cb6d109

3 files changed

Lines changed: 0 additions & 32 deletions

File tree

fs/inode.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ int inode_init_always_gfp(struct super_block *sb, struct inode *inode, gfp_t gfp
276276

277277
mapping->a_ops = &empty_aops;
278278
mapping->host = inode;
279-
mapping->i_metadata_bhs.mapping = mapping;
280279
mapping->flags = 0;
281280
mapping->wb_err = 0;
282281
atomic_set(&mapping->i_mmap_writable, 0);
@@ -484,8 +483,6 @@ static void __address_space_init_once(struct address_space *mapping)
484483
init_rwsem(&mapping->i_mmap_rwsem);
485484
INIT_LIST_HEAD(&mapping->i_private_list);
486485
spin_lock_init(&mapping->i_private_lock);
487-
spin_lock_init(&mapping->i_metadata_bhs.lock);
488-
INIT_LIST_HEAD(&mapping->i_metadata_bhs.list);
489486
mapping->i_mmap = RB_ROOT_CACHED;
490487
}
491488

include/linux/buffer_head.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -207,28 +207,10 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate);
207207

208208
/* Things to do with metadata buffers list */
209209
void mmb_mark_buffer_dirty(struct buffer_head *bh, struct mapping_metadata_bhs *mmb);
210-
static inline void mark_buffer_dirty_inode(struct buffer_head *bh,
211-
struct inode *inode)
212-
{
213-
mmb_mark_buffer_dirty(bh, &inode->i_data.i_metadata_bhs);
214-
}
215210
int mmb_fsync_noflush(struct file *file, struct mapping_metadata_bhs *mmb,
216211
loff_t start, loff_t end, bool datasync);
217-
static inline int generic_buffers_fsync_noflush(struct file *file,
218-
loff_t start, loff_t end,
219-
bool datasync)
220-
{
221-
return mmb_fsync_noflush(file, &file->f_mapping->i_metadata_bhs,
222-
start, end, datasync);
223-
}
224212
int mmb_fsync(struct file *file, struct mapping_metadata_bhs *mmb,
225213
loff_t start, loff_t end, bool datasync);
226-
static inline int generic_buffers_fsync(struct file *file,
227-
loff_t start, loff_t end, bool datasync)
228-
{
229-
return mmb_fsync(file, &file->f_mapping->i_metadata_bhs,
230-
start, end, datasync);
231-
}
232214
void clean_bdev_aliases(struct block_device *bdev, sector_t block,
233215
sector_t len);
234216
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);
537519
bool mmb_has_buffers(struct mapping_metadata_bhs *mmb);
538520
void mmb_invalidate(struct mapping_metadata_bhs *mmb);
539521
int mmb_sync(struct mapping_metadata_bhs *mmb);
540-
static inline void invalidate_inode_buffers(struct inode *inode)
541-
{
542-
mmb_invalidate(&inode->i_data.i_metadata_bhs);
543-
}
544-
static inline int sync_mapping_buffers(struct address_space *mapping)
545-
{
546-
return mmb_sync(&mapping->i_metadata_bhs);
547-
}
548522
void invalidate_bh_lrus(void);
549523
void invalidate_bh_lrus_cpu(void);
550524
bool has_bh_in_lru(int cpu, void *dummy);
@@ -555,8 +529,6 @@ extern int buffer_heads_over_limit;
555529
static inline void buffer_init(void) {}
556530
static inline bool try_to_free_buffers(struct folio *folio) { return true; }
557531
static inline int mmb_sync(struct mapping_metadata_bhs *mmb) { return 0; }
558-
static inline void invalidate_inode_buffers(struct inode *inode) {}
559-
static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }
560532
static inline void invalidate_bh_lrus(void) {}
561533
static inline void invalidate_bh_lrus_cpu(void) {}
562534
static inline bool has_bh_in_lru(int cpu, void *dummy) { return false; }

include/linux/fs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ struct address_space {
491491
errseq_t wb_err;
492492
spinlock_t i_private_lock;
493493
struct list_head i_private_list;
494-
struct mapping_metadata_bhs i_metadata_bhs;
495494
struct rw_semaphore i_mmap_rwsem;
496495
} __attribute__((aligned(sizeof(long)))) __randomize_layout;
497496
/*

0 commit comments

Comments
 (0)