fs: move invalidate_bdev
Subsystems (17)
PATCH 1/1 fs: move invalidate_bdev
Hi,
Just had a couple of prequel patches for fsblock that seem reasonable on their own. Afterwards, we basically have enough there to remove all buffer_head knowledge from mm and fs core code. Filesystems need to be switched to use the helpers before that _actually_ happens though.
Comments?
--
Move invalidate_bdev into fs/block_dev.c.
Export kill_bdev as well, so brd doesn't have to open code it. Reduce buffer_head.h requirement accordingly.
Removed a rather large comment from invalidate_bdev, as it looked a bit obsolete to bother moving. The small comment replacing it says enough.
--- arch/powerpc/sysdev/axonram.c | 1 block/genhd.c | 1 block/ioctl.c | 2 - drivers/block/amiflop.c | 2 - drivers/block/brd.c | 9 +++----- drivers/block/floppy.c | 1 drivers/block/loop.c | 1 drivers/cdrom/cdrom.c | 1 drivers/char/sysrq.c | 1 drivers/md/dm.c | 1 drivers/md/md.c | 2 - drivers/mtd/devices/block2mtd.c | 1 drivers/s390/block/dasd.c | 1 drivers/s390/char/tape_block.c | 1 drivers/scsi/scsicam.c | 1 drivers/staging/dst/dcore.c | 2 - drivers/staging/dst/state.c | 1 fs/block_dev.c | 23 ++++++++++++++++++-- fs/buffer.c | 44 ---------------------------------------- fs/quota/dquot.c | 1 fs/quota/quota.c | 1 include/linux/fs.h | 2 + kernel/power/swap.c | 1 23 files changed, 30 insertions(+), 71 deletions(-)
drivers/block/brd.c +4 -5
@@ -17,7 +17,7 @@#include <linux/highmem.h> #include <linux/gfp.h> #include <linux/radix-tree.h> -#include <linux/buffer_head.h> /* invalidate_bh_lrus() */ +#include <linux/fs.h> #include <asm/uaccess.h>
@@ -359,14 +359,13 @@ static int brd_ioctl(struct block_device error = -EBUSY ;if (bdev->bd_openers <=1 ) {/* -* Invalidate the cache first, so it isn't written -* back to the device. +* Kill the cache first, so it isn't written back to the +* device. * * Another thread might instantiate more buffercache here, * but there is not much we can do to close that race. */ -invalidate_bh_lrus (); -truncate_inode_pages (bdev->bd_inode->i_mapping,0 ); +kill_bdev (bdev);brd_free_pages (brd); error =0 ; }
drivers/block/loop.c +0 -1
@@ -68,7 +68,6 @@#include <linux/suspend.h> #include <linux/freezer.h> #include <linux/writeback.h> -#include <linux/buffer_head.h> /* for invalidate_bdev() */ #include <linux/completion.h> #include <linux/highmem.h> #include <linux/gfp.h>
drivers/md/md.c +1 -1
@@ -36,7 +36,7 @@#include <linux/blkdev.h> #include <linux/sysctl.h> #include <linux/seq_file.h> -#include <linux/buffer_head.h> /* for invalidate_bdev */ +#include <linux/fs.h> #include <linux/poll.h> #include <linux/ctype.h> #include <linux/string.h>
fs/block_dev.c +20 -3
@@ -62,13 +62,30 @@ static sector_t max_block(struct block_d }/* Kill _all_ buffers and pagecache , dirty or not.. */ -static void kill_bdev (struct block_device *bdev) +void kill_bdev (struct block_device *bdev) { -if (bdev->bd_inode->i_mapping->nrpages ==0 ) +struct address_space *mapping = bdev->bd_inode->i_mapping; + +if (mapping->nrpages ==0 )return ; +invalidate_bh_lrus (); -truncate_inode_pages (bdev->bd_inode->i_mapping,0 ); +truncate_inode_pages (mapping,0 ); } +EXPORT_SYMBOL (kill_bdev); + +/* Invalidate clean unused buffers and pagecache. */ +void invalidate_bdev (struct block_device *bdev) +{ +struct address_space *mapping = bdev->bd_inode->i_mapping; + +if (mapping->nrpages ==0 ) +return ; + +invalidate_bh_lrus (); +invalidate_mapping_pages (mapping,0 ,-1 ); +} +EXPORT_SYMBOL (invalidate_bdev);int set_blocksize (struct block_device *bdev,int size) {
fs/buffer.c +0 -44
50 lines not on this page · raw message
fs/quota/dquot.c +0 -1
@@ -73,7 +73,6 @@#include <linux/security.h> #include <linux/kmod.h> #include <linux/namei.h> -#include <linux/buffer_head.h> #include <linux/capability.h> #include <linux/quotaops.h> #include <linux/writeback.h> /* for inode_lock, oddly enough.. */
fs/quota/quota.c +0 -1
@@ -13,7 +13,6 @@#include <linux/kernel.h> #include <linux/security.h> #include <linux/syscalls.h> -#include <linux/buffer_head.h> #include <linux/capability.h> #include <linux/quotaops.h> #include <linux/types.h>
include/linux/fs.h +2 -0
@@ -1947,6 +1947,7 @@ extern void bd_set_size(struct block_devextern void bd_forget (struct inode *inode);extern void bdput (struct block_device *);extern struct block_device *open_by_devnum (dev_t ,fmode_t ); +extern void kill_bdev (struct block_device *);extern void invalidate_bdev (struct block_device *);extern int sync_blockdev (struct block_device *bdev);extern struct super_block *freeze_bdev (struct block_device *);
@@ -1956,6 +1957,7 @@ extern int fsync_bdev(struct block_devic#else static inline void bd_forget (struct inode *inode) {}static inline int sync_blockdev (struct block_device *bdev) {return 0 ; } +static inline void kill_bdev (struct block_device *bdev) {}static inline void invalidate_bdev (struct block_device *bdev) {}static inline struct super_block *freeze_bdev (struct block_device *sb)
block/genhd.c +0 -1
@@ -15,7 +15,6 @@#include <linux/slab.h> #include <linux/kmod.h> #include <linux/kobj_map.h> -#include <linux/buffer_head.h> #include <linux/mutex.h> #include <linux/idr.h>
block/ioctl.c +1 -1
@@ -3,7 +3,7 @@#include <linux/blkpg.h> #include <linux/hdreg.h> #include <linux/backing-dev.h> -#include <linux/buffer_head.h> +#include <linux/fs.h> #include <linux/smp_lock.h> #include <linux/blktrace_api.h> #include <asm/uaccess.h>
drivers/block/amiflop.c +1 -1
@@ -61,7 +61,7 @@#include <linux/init.h> #include <linux/amifdreg.h> #include <linux/amifd.h> -#include <linux/buffer_head.h> +#include <linux/fs.h> #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/interrupt.h>
drivers/block/floppy.c +0 -1
@@ -188,7 +188,6 @@ static int print_unex = 1;#include <linux/init.h> #include <linux/platform_device.h> #include <linux/mod_devicetable.h> -#include <linux/buffer_head.h> /* for invalidate_buffers() */ #include <linux/mutex.h> #include <linux/io.h> #include <linux/uaccess.h>
drivers/char/sysrq.c +0 -1
@@ -31,7 +31,6 @@#include <linux/module.h> #include <linux/suspend.h> #include <linux/writeback.h> -#include <linux/buffer_head.h> /* for fsync_bdev() */ #include <linux/swap.h> #include <linux/spinlock.h> #include <linux/vt_kern.h>
arch/powerpc/sysdev/axonram.c +0 -1
@@ -25,7 +25,6 @@#include <linux/bio.h> #include <linux/blkdev.h> -#include <linux/buffer_head.h> #include <linux/device.h> #include <linux/errno.h> #include <linux/fs.h>
drivers/cdrom/cdrom.c +0 -1
@@ -265,7 +265,6 @@#include <linux/module.h> #include <linux/fs.h> -#include <linux/buffer_head.h> #include <linux/major.h> #include <linux/types.h> #include <linux/errno.h>
drivers/md/dm.c +0 -1
@@ -14,7 +14,6 @@#include <linux/moduleparam.h> #include <linux/blkpg.h> #include <linux/bio.h> -#include <linux/buffer_head.h> #include <linux/mempool.h> #include <linux/slab.h> #include <linux/idr.h>
drivers/mtd/devices/block2mtd.c +0 -1
@@ -14,7 +14,6 @@#include <linux/list.h> #include <linux/init.h> #include <linux/mtd/mtd.h> -#include <linux/buffer_head.h> #include <linux/mutex.h> #include <linux/mount.h>
drivers/s390/block/dasd.c +0 -1
@@ -17,7 +17,6 @@#include <linux/ctype.h> #include <linux/major.h> #include <linux/slab.h> -#include <linux/buffer_head.h> #include <linux/hdreg.h> #include <linux/async.h> #include <linux/mutex.h>
drivers/s390/char/tape_block.c +0 -1
@@ -17,7 +17,6 @@#include <linux/module.h> #include <linux/blkdev.h> #include <linux/interrupt.h> -#include <linux/buffer_head.h> #include <linux/kernel.h> #include <asm/debug.h>
drivers/scsi/scsicam.c +0 -1
@@ -15,7 +15,6 @@#include <linux/genhd.h> #include <linux/kernel.h> #include <linux/blkdev.h> -#include <linux/buffer_head.h> #include <asm/unaligned.h> #include <scsi/scsicam.h>
kernel/power/swap.c +0 -1
@@ -17,7 +17,6 @@#include <linux/bitops.h> #include <linux/genhd.h> #include <linux/device.h> -#include <linux/buffer_head.h> #include <linux/bio.h> #include <linux/blkdev.h> #include <linux/swap.h>
PATCH 1/1 fs: avoid buffer_head
This is the more interesting patch. I wonder if any filesystem people have interesting requests of the callbacks? Also, I didn't put the equivalent invalidate_inode_buffers callback in clear_inode because I was hoping filesystems could do that. But maybe it is required in some cases?
--
Introduce new address space operations sync and release, which can be used by a filesystem to synchronize and release per-address_space private metadata. They generalise sync_mapping_buffers, invalidate_inode_buffers, and remove_inode_buffers calls, and get another step closer to divorcing buffer heads from core mm/fs code.
--- fs/buffer.c | 4 ++-- fs/inode.c | 42 ++++++++++++++++++++++++++++++++---------- fs/libfs.c | 7 ++++++- include/linux/buffer_head.h | 2 -- include/linux/fs.h | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 15 deletions(-)
fs/buffer.c +2 -2
@@ -476,9 +476,9 @@ static void __remove_assoc_queue(struct bh->b_assoc_map =NULL ; } -int inode_has_buffers (struct inode *inode) +static int inode_has_buffers (struct inode *inode) { -return !list_empty (&inode->i_data.private_list); +return mapping_has_private (&inode->i_data); }/*
include/linux/buffer_head.h +0 -2
@@ -159,7 +159,6 @@ void end_buffer_async_write(struct buffe/* Things to do with buffers at mapping->private_list */ void mark_buffer_dirty_inode (struct buffer_head *bh,struct inode *inode); -int inode_has_buffers (struct inode *);void invalidate_inode_buffers (struct inode *);int remove_inode_buffers (struct inode *inode);int sync_mapping_buffers (struct address_space *mapping);
@@ -335,7 +334,6 @@ extern int __set_page_dirty_buffers(strustatic inline void buffer_init (void ) {}static inline int try_to_free_buffers (struct page *page) {return 1 ; } -static inline int inode_has_buffers (struct inode *inode) {return 0 ; }static inline void invalidate_inode_buffers (struct inode *inode) {}static inline int remove_inode_buffers (struct inode *inode) {return 1 ; }static inline int sync_mapping_buffers (struct address_space *mapping) {return 0 ; }
fs/inode.c +32 -10
102 lines not on this page · raw message
include/linux/fs.h +35 -0
@@ -569,6 +569,17 @@ typedef struct {typedef int (*read_actor_t )(read_descriptor_t *,struct page *,unsigned long ,unsigned long ); +/* +* Flags for address_space_operations.release operations. +*/ +#define AOP_RELEASE_FORCE 0x01/* Release dirty and in-use data */ + +/* +* Flags for address_space_operations.sync operations. +*/ +#define AOP_SYNC_WRITE 0x01/* Begin writeout */ +#define AOP_SYNC_WAIT 0x02/* Wait for started writeout */ +struct address_space_operations {int (*writepage)(struct page *page,struct writeback_control *wbc);int (*readpage)(struct file *,struct page *);
@@ -604,6 +615,22 @@ struct address_space_operations {int (*launder_page) (struct page *);int (*is_partially_uptodate) (struct page *,read_descriptor_t *,unsigned long ); +/* +* release_mapping releases any private data on the mapping so that +* it may be reclaimed. +* Second parameter is flags (see above). +* Returns 0 success, or -errno. +*/ +int (*release)(struct address_space *,unsigned int ); + +/* +* sync writes back and waits for any private data on the mapping, +* as a data consistency operation. +* Second parameter is flags (see above). +* Returns 0 success, or -errno. +*/ +int (*sync)(struct address_space *,unsigned int ); +int (*error_remove_page)(struct address_space *,struct page *); };
@@ -688,6 +715,14 @@ struct block_device {int mapping_tagged (struct address_space *mapping,int tag);/* +* Does this mapping have anything on its private list? +*/ +static inline int mapping_has_private (struct address_space *mapping) +{ +return !list_empty (&mapping->private_list); +} + +/* * Might pages of this file be mapped into userspace? */ static inline int mapping_mapped (struct address_space *mapping)
fs/libfs.c +6 -1
@@ -823,10 +823,15 @@ int simple_fsync(struct file *file, stru .nr_to_write = 0, /* metadata-only; caller takes care of data */ };struct inode *inode = dentry->d_inode; +struct address_space *mapping = inode->i_mapping;int err;int ret; - ret =sync_mapping_buffers (inode->i_mapping); +if (!mapping->a_ops->sync) + ret =sync_mapping_buffers (mapping); +else + ret = mapping->a_ops->sync (mapping,AOP_SYNC_WRITE |AOP_SYNC_WAIT ); +if (!(inode->i_state &I_DIRTY ))return ret;if (datasync && !(inode->i_state &I_DIRTY_DATASYNC ))