fs: pass exact type of data dirties to ->dirty_inode
Subsystems (9)
PATCH 1/1 fs: pass exact type of data dirties to ->dirty_inode
Tell the filesystem if we just updated timestamp (I_DIRTY_SYNC) or anything else, so that the filesystem can track internally if it needs to push out a transaction for fdatasync or not.
This is just the prototype change with no user for it yet. I plan to push large XFS changes for the next merge window, and getting this trivial infrastructure in this window would help a lot to avoid tree interdependencies.
Also remove incorrect comments that ->dirty_inode can't block. That has been changed a long time ago, and many implementations rely on it.
fs/fs-writeback.c +1 -4
@@ -1007,9 +1007,6 @@ static noinline void block_dump___mark_i* In short, make sure you hash any inodes _before_ you start marking * them dirty. * -* This function *must* be atomic for the I_DIRTY_PAGES case - -* set_page_dirty() is called under spinlock in several places. -* * Note that for blockdevs, inode->dirtied_when represents the dirtying time of * the block-special inode (/dev/hda1) itself. And the ->dirtied_when field of * the kernel-internal blockdev inode represents the dirtying time of the
@@ -1028,7 +1025,7 @@ void __mark_inode_dirty(struct inode *in*/ if (flags & (I_DIRTY_SYNC |I_DIRTY_DATASYNC )) {if (sb->s_op->dirty_inode) - sb->s_op->dirty_inode (inode); + sb->s_op->dirty_inode (inode, flags); }/*
Documentation/filesystems/Locking +2 -2
@@ -104,7 +104,7 @@ of the locking scheme for directory oper prototypes: struct inode *(*alloc_inode)(struct super_block *sb); void (*destroy_inode)(struct inode *); - void (*dirty_inode) (struct inode *); + void (*dirty_inode) (struct inode *, int flags); int (*write_inode) (struct inode *, struct writeback_control *wbc); int (*drop_inode) (struct inode *); void (*evict_inode) (struct inode *);
@@ -126,7 +126,7 @@ locking rules: s_umount alloc_inode: destroy_inode: -dirty_inode: (must not sleep) +dirty_inode: write_inode: drop_inode: !!!inode->i_lock!!! evict_inode:
Documentation/filesystems/vfs.txt +1 -1
@@ -211,7 +211,7 @@ struct super_operations { struct inode *(*alloc_inode)(struct super_block *sb); void (*destroy_inode)(struct inode *); - void (*dirty_inode) (struct inode *); + void (*dirty_inode) (struct inode *, int flags); int (*write_inode) (struct inode *, int); void (*drop_inode) (struct inode *); void (*delete_inode) (struct inode *);
include/linux/fs.h +1 -1
@@ -1618,7 +1618,7 @@ struct super_operations {struct inode *(*alloc_inode)(struct super_block *sb);void (*destroy_inode)(struct inode *); -void (*dirty_inode) (struct inode *); +void (*dirty_inode) (struct inode *,int flags);int (*write_inode) (struct inode *,struct writeback_control *wbc);int (*drop_inode) (struct inode *);void (*evict_inode) (struct inode *);
fs/nilfs2/inode.c +1 -1
@@ -917,7 +917,7 @@ int nilfs_mark_inode_dirty(struct inode* construction. This function can be called both as a single operation * and as a part of indivisible file operations. */ -void nilfs_dirty_inode (struct inode *inode) +void nilfs_dirty_inode (struct inode *inode,int flags) {struct nilfs_transaction_info ti;struct nilfs_mdt_info *mdi =NILFS_MDT (inode);
fs/nilfs2/nilfs.h +1 -1
@@ -269,7 +269,7 @@ int nilfs_load_inode_block(struct inodeextern int nilfs_inode_dirty (struct inode *);int nilfs_set_file_dirty (struct inode *inode,unsigned nr_dirty);extern int nilfs_mark_inode_dirty (struct inode *); -extern void nilfs_dirty_inode (struct inode *); +extern void nilfs_dirty_inode (struct inode *,int flags);int nilfs_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,__u64 start,__u64 len);
fs/reiserfs/super.c +1 -1
@@ -568,7 +568,7 @@ static void destroy_inodecache(void) }/* we don't mark inodes dirty, we just log them */ -static void reiserfs_dirty_inode (struct inode *inode) +static void reiserfs_dirty_inode (struct inode *inode,int flags) {struct reiserfs_transaction_handle th;
fs/ubifs/super.c +1 -1
@@ -382,7 +382,7 @@ done:end_writeback (inode); } -static void ubifs_dirty_inode (struct inode *inode) +static void ubifs_dirty_inode (struct inode *inode,int flags) {struct ubifs_inode *ui =ubifs_inode (inode);
fs/xfs/linux-2.6/xfs_super.c +2 -1
@@ -925,7 +925,8 @@ xfs_fs_inode_init_once(*/ STATIC voidxfs_fs_dirty_inode ( -struct inode *inode) +struct inode *inode, +int flags) {barrier ();XFS_I (inode)->i_update_core =1 ;
fs/btrfs/ctree.h +1 -1
@@ -2522,7 +2522,7 @@ int btrfs_readpage(struct file *file, stvoid btrfs_evict_inode (struct inode *inode);void btrfs_put_inode (struct inode *inode);int btrfs_write_inode (struct inode *inode,struct writeback_control *wbc); -void btrfs_dirty_inode (struct inode *inode); +void btrfs_dirty_inode (struct inode *inode,int flags);struct inode *btrfs_alloc_inode (struct super_block *sb);void btrfs_destroy_inode (struct inode *inode);int btrfs_drop_inode (struct inode *inode);
fs/btrfs/inode.c +1 -1
@@ -4396,7 +4396,7 @@ int btrfs_write_inode(struct inode *inod* FIXME, needs more benchmarking...there are no reasons other than performance * to keep or drop this code. */ -void btrfs_dirty_inode (struct inode *inode) +void btrfs_dirty_inode (struct inode *inode,int flags) {struct btrfs_root *root =BTRFS_I (inode)->root;struct btrfs_trans_handle *trans;
fs/ext3/inode.c +1 -1
@@ -3392,7 +3392,7 @@ int ext3_mark_inode_dirty(handle_t *hand* so would cause a commit on atime updates, which we don't bother doing. * We handle synchronous inodes at the highest possible level. */ -void ext3_dirty_inode (struct inode *inode) +void ext3_dirty_inode (struct inode *inode,int flags) {handle_t *current_handle =ext3_journal_current_handle ();handle_t *handle;
fs/ext4/ext4.h +1 -1
@@ -1813,7 +1813,7 @@ extern int ext4_getattr(struct vfsmountextern void ext4_evict_inode (struct inode *);extern void ext4_clear_inode (struct inode *);extern int ext4_sync_inode (handle_t *,struct inode *); -extern void ext4_dirty_inode (struct inode *); +extern void ext4_dirty_inode (struct inode *,int );extern int ext4_change_inode_journal_flag (struct inode *,int );extern int ext4_get_inode_loc (struct inode *,struct ext4_iloc *);extern int ext4_can_truncate (struct inode *inode);
fs/ext4/inode.c +1 -1
@@ -5733,7 +5733,7 @@ int ext4_mark_inode_dirty(handle_t *hand* so would cause a commit on atime updates, which we don't bother doing. * We handle synchronous inodes at the highest possible level. */ -void ext4_dirty_inode (struct inode *inode) +void ext4_dirty_inode (struct inode *inode,int flags) {handle_t *handle;
fs/jffs2/fs.c +1 -1
@@ -357,7 +357,7 @@ error:return ERR_PTR (ret); } -void jffs2_dirty_inode (struct inode *inode) +void jffs2_dirty_inode (struct inode *inode,int flags) {struct iattr iattr;
fs/jffs2/os-linux.h +1 -1
@@ -172,7 +172,7 @@ int jffs2_setattr (struct dentry *, struint jffs2_do_setattr (struct inode *,struct iattr *);struct inode *jffs2_iget (struct super_block *,unsigned long );void jffs2_evict_inode (struct inode *); -void jffs2_dirty_inode (struct inode *inode); +void jffs2_dirty_inode (struct inode *inode,int flags);struct inode *jffs2_new_inode (struct inode *dir_i,int mode,struct jffs2_raw_inode *ri);int jffs2_statfs (struct dentry *,struct kstatfs *);
fs/jfs/inode.c +1 -1
@@ -173,7 +173,7 @@ void jfs_evict_inode(struct inode *inodedquot_drop (inode); } -void jfs_dirty_inode (struct inode *inode) +void jfs_dirty_inode (struct inode *inode,int flags) {static int noisy =5 ;
fs/jfs/jfs_inode.h +1 -1
@@ -28,7 +28,7 @@ extern struct inode *jfs_iget(struct supextern int jfs_commit_inode (struct inode *,int );extern int jfs_write_inode (struct inode *,struct writeback_control *);extern void jfs_evict_inode (struct inode *); -extern void jfs_dirty_inode (struct inode *); +extern void jfs_dirty_inode (struct inode *,int );extern void jfs_truncate (struct inode *);extern void jfs_truncate_nolock (struct inode *,loff_t );extern void jfs_free_zero_link (struct inode *);
include/linux/ext3_fs.h +1 -1
@@ -909,7 +909,7 @@ extern int ext3_setattr (struct dentryextern void ext3_evict_inode (struct inode *);extern int ext3_sync_inode (handle_t *,struct inode *);extern void ext3_discard_reservation (struct inode *); -extern void ext3_dirty_inode (struct inode *); +extern void ext3_dirty_inode (struct inode *,int );extern int ext3_change_inode_journal_flag (struct inode *,int );extern int ext3_get_inode_loc (struct inode *,struct ext3_iloc *);extern int ext3_can_truncate (struct inode *inode);
Quoted 8 lines · Christoph Hellwig
Tell the filesystem if we just updated timestamp (
I_DIRTY_SYNC) or anything else, so that the filesystem can track internally if it needs to push out a transaction for fdatasync or not.This is just the prototype change with no user for it yet. I plan to push large XFS changes for the next merge window, and getting this trivial infrastructure in this window would help a lot to avoid tree interdependencies.
*nod*
Applied.