a few I_DIRTY* related cleanups
Subsystems (6)
Move I_DIRTY_INODE to fs.h, and use the I_DIRTY* defines more consistently.
PATCH 1/4 gfs2: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) calls
I_DIRTY_DATASYNC is a strict superset of I_DIRTY_SYNC semantics, as in mark dirty to be written out by fdatasync as well. So dirtying for both flags makes no sense.
--- fs/gfs2/xattr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/gfs2/xattr.c +4 -4
@@ -308,7 +308,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh, } ip->i_inode.i_ctime =current_time (&ip->i_inode); -__mark_inode_dirty (&ip->i_inode,I_DIRTY_SYNC |I_DIRTY_DATASYNC ); +__mark_inode_dirty (&ip->i_inode,I_DIRTY_DATASYNC );gfs2_trans_end (sdp);
@@ -768,7 +768,7 @@ static int ea_alloc_skeleton(struct gfs2_inode *ip, struct gfs2_ea_request *er, goto out_end_trans; ip->i_inode.i_ctime =current_time (&ip->i_inode); -__mark_inode_dirty (&ip->i_inode,I_DIRTY_SYNC |I_DIRTY_DATASYNC ); +__mark_inode_dirty (&ip->i_inode,I_DIRTY_DATASYNC ); out_end_trans:gfs2_trans_end (GFS2_SB (&ip->i_inode));
@@ -896,7 +896,7 @@ static int ea_set_simple_noalloc(struct gfs2_inode *ip, struct buffer_head *bh,ea_set_remove_stuffed (ip, es->es_el); ip->i_inode.i_ctime =current_time (&ip->i_inode); -__mark_inode_dirty (&ip->i_inode,I_DIRTY_SYNC |I_DIRTY_DATASYNC ); +__mark_inode_dirty (&ip->i_inode,I_DIRTY_DATASYNC );gfs2_trans_end (GFS2_SB (&ip->i_inode));return error;
@@ -1114,7 +1114,7 @@ static int ea_remove_stuffed(struct gfs2_inode *ip, struct gfs2_ea_location *el) } ip->i_inode.i_ctime =current_time (&ip->i_inode); -__mark_inode_dirty (&ip->i_inode,I_DIRTY_SYNC |I_DIRTY_DATASYNC ); +__mark_inode_dirty (&ip->i_inode,I_DIRTY_DATASYNC );gfs2_trans_end (GFS2_SB (&ip->i_inode));
Signature · 1 line
2.14.2
PATCH 2/4 ntfs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
In reply to Christoph HellwigI_DIRTY_DATASYNC is a strict superset of I_DIRTY_SYNC semantics, as in mark dirty to be written out by fdatasync as well. So dirtying for both flags makes no sense.
--- fs/ntfs/mft.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ntfs/mft.c +2 -2
@@ -381,7 +381,7 @@ MFT_RECORD *map_extent_mft_record(ntfs_inode *base_ni, MFT_REF mref,* vfs inode dirty. This ensures that any changes to the mft record are * written out to disk. * -* NOTE: We only set I_DIRTY_SYNC and I_DIRTY_DATASYNC (and not I_DIRTY_PAGES) +* NOTE: We only set I_DIRTY_DATASYNC (and not I_DIRTY_PAGES) * on the base vfs inode, because even though file data may have been modified, * it is dirty in the inode meta data rather than the data page cache of the * inode, and thus there are no data pages that need writing out. Therefore, a
@@ -407,7 +407,7 @@ void __mark_mft_record_dirty(ntfs_inode *ni)else base_ni = ni->ext.base_ntfs_ino;mutex_unlock (&ni->extent_lock); -__mark_inode_dirty (VFS_I (base_ni),I_DIRTY_SYNC |I_DIRTY_DATASYNC ); +__mark_inode_dirty (VFS_I (base_ni),I_DIRTY_DATASYNC ); }static const char *ntfs_please_email ="Please email "
Signature · 1 line
2.14.2
PATCH 3/4 ubifs: fix bogus __mark_inode_dirty(I_DIRTY_SYNC | I_DIRTY_DATASYNC) call
In reply to Christoph HellwigI_DIRTY_DATASYNC is a strict superset of I_DIRTY_SYNC semantics, as in mark dirty to be written out by fdatasync as well. So dirtying for both flags makes no sense.
--- fs/ubifs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ubifs/file.c +1 -1
@@ -1256,7 +1256,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,* Inode length changed, so we have to make sure * @I_DIRTY_DATASYNC is set. */ -__mark_inode_dirty (inode,I_DIRTY_SYNC |I_DIRTY_DATASYNC ); +__mark_inode_dirty (inode,I_DIRTY_DATASYNC ); elsemark_inode_dirty_sync (inode );mutex_unlock (&ui->ui_mutex);
Signature · 1 line
2.14.2
PATCH 4/4 fs: move I_DIRTY_INODE to fs.h
In reply to Christoph HellwigAnd use it in a few more places rather than opencoding the values.
--- fs/ext4/inode.c | 4 ++-- fs/fs-writeback.c | 9 +++------ fs/gfs2/super.c | 2 +- include/linux/fs.h | 3 ++- 4 files changed, 8 insertions(+), 10 deletions(-)
fs/ext4/inode.c +2 -2
@@ -5032,12 +5032,12 @@ static int other_inode_match(struct inode * inode, unsigned long ino,if ((inode->i_ino != ino) || (inode->i_state & (I_FREEING |I_WILL_FREE |I_NEW | -I_DIRTY_SYNC |I_DIRTY_DATASYNC )) || +I_DIRTY_INODE )) || ((inode->i_state &I_DIRTY_TIME ) ==0 ))return 0 ;spin_lock (&inode->i_lock);if (((inode->i_state & (I_FREEING |I_WILL_FREE |I_NEW | -I_DIRTY_SYNC |I_DIRTY_DATASYNC )) ==0 ) && +I_DIRTY_INODE )) ==0 ) && (inode->i_state &I_DIRTY_TIME )) {struct ext4_inode_info *ei =EXT4_I (inode);
fs/fs-writeback.c +3 -6
@@ -1343,7 +1343,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc) dirty = inode->i_state &I_DIRTY ; if (inode->i_state & I_DIRTY_TIME) { - if ((dirty & (I_DIRTY_SYNC | I_DIRTY_DATASYNC)) || + if ((dirty & I_DIRTY_INODE) || wbc->sync_mode == WB_SYNC_ALL || unlikely(inode->i_state & I_DIRTY_TIME_EXPIRED) || unlikely(time_after(jiffies,
@@ -2112,7 +2112,6 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode)*/ void __mark_inode_dirty (struct inode *inode,int flags) { -#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)struct super_block *sb = inode->i_sb;int dirtytime;
@@ -2122,7 +2121,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)* Don't do this for I_DIRTY_PAGES - that doesn't actually * dirty the inode itself */ -if (flags & (I_DIRTY_SYNC |I_DIRTY_DATASYNC |I_DIRTY_TIME )) { +if (flags & (I_DIRTY_INODE |I_DIRTY_TIME )) {trace_writeback_dirty_inode_start (inode, flags);if (sb->s_op->dirty_inode)
@@ -2197,7 +2196,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)if (dirtytime) inode->dirtied_time_when = jiffies; -if (inode->i_state & (I_DIRTY_INODE |I_DIRTY_PAGES )) +if (inode->i_state &I_DIRTY ) dirty_list = &wb->b_dirty;else dirty_list = &wb->b_dirty_time;
@@ -2221,8 +2220,6 @@ void __mark_inode_dirty(struct inode *inode, int flags) } out_unlock_inode:spin_unlock (&inode->i_lock); - -#undef I_DIRTY_INODE }EXPORT_SYMBOL (__mark_inode_dirty);
fs/gfs2/super.c +1 -1
@@ -800,7 +800,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)int need_endtrans =0 ;int ret; -if (!(flags & (I_DIRTY_DATASYNC |I_DIRTY_SYNC ))) +if (!(flags &I_DIRTY_INODE ))return ;if (unlikely (test_bit (SDF_SHUTDOWN , &sdp->sd_flags)))return ;
include/linux/fs.h +2 -1
@@ -2014,7 +2014,8 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)#define I_WB_SWITCH (1 << 13)#define I_OVL_INUSE (1 << 14) -#define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES) +#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC) +#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)#define I_DIRTY_ALL (I_DIRTY | I_DIRTY_TIME)extern void __mark_inode_dirty (struct inode *,int );
Signature · 1 line
2.14.2
Re: [PATCH 4/4] fs: move I_DIRTY_INODE to fs.h
Quoted 3 lines · Christoph Hellwig
And use it in a few more places rather than opencoding the values.
Signed-off-by Christoph Hellwig <[email protected]>
Looks fine to me. You can add:
Honza
Quoted 104 lines
--- fs/ext4/inode.c | 4 ++-- fs/fs-writeback.c | 9 +++------ fs/gfs2/super.c | 2 +- include/linux/fs.h | 3 ++- 4 files changed, 8 insertions(+), 10 deletions(-)fs/ext4/inode.c +2
-2@@ -5032,12 +5032,12 @@ static int other_inode_match(struct inode * inode, unsigned long ino,if ((inode->i_ino != ino) || (inode->i_state & (I_FREEING |I_WILL_FREE |I_NEW | -I_DIRTY_SYNC |I_DIRTY_DATASYNC )) || +I_DIRTY_INODE )) || ((inode->i_state &I_DIRTY_TIME ) ==0 ))return 0 ;spin_lock (&inode->i_lock);if (((inode->i_state & (I_FREEING |I_WILL_FREE |I_NEW | -I_DIRTY_SYNC |I_DIRTY_DATASYNC )) ==0 ) && +I_DIRTY_INODE )) ==0 ) && (inode->i_state &I_DIRTY_TIME )) {struct ext4_inode_info *ei =EXT4_I (inode);fs/fs-writeback.c +3
-6@@ -1343,7 +1343,7 @@ __writeback_single_inode(struct inode *inode, struct writeback_control *wbc) dirty = inode->i_state &I_DIRTY ; if (inode->i_state & I_DIRTY_TIME) { - if ((dirty & (I_DIRTY_SYNC | I_DIRTY_DATASYNC)) || + if ((dirty & I_DIRTY_INODE) || wbc->sync_mode == WB_SYNC_ALL || unlikely(inode->i_state & I_DIRTY_TIME_EXPIRED) || unlikely(time_after(jiffies,@@ -2112,7 +2112,6 @@ static noinline void block_dump___mark_inode_dirty(struct inode *inode)*/ void __mark_inode_dirty (struct inode *inode,int flags) { -#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)struct super_block *sb = inode->i_sb;int dirtytime;@@ -2122,7 +2121,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)* Don't do this for I_DIRTY_PAGES - that doesn't actually * dirty the inode itself */ -if (flags & (I_DIRTY_SYNC |I_DIRTY_DATASYNC |I_DIRTY_TIME )) { +if (flags & (I_DIRTY_INODE |I_DIRTY_TIME )) {trace_writeback_dirty_inode_start (inode, flags);if (sb->s_op->dirty_inode)@@ -2197,7 +2196,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)if (dirtytime) inode->dirtied_time_when = jiffies; -if (inode->i_state & (I_DIRTY_INODE |I_DIRTY_PAGES )) +if (inode->i_state &I_DIRTY ) dirty_list = &wb->b_dirty;else dirty_list = &wb->b_dirty_time;@@ -2221,8 +2220,6 @@ void __mark_inode_dirty(struct inode *inode, int flags) } out_unlock_inode:spin_unlock (&inode->i_lock); - -#undef I_DIRTY_INODE }EXPORT_SYMBOL (__mark_inode_dirty);fs/gfs2/super.c +1
-1@@ -800,7 +800,7 @@ static void gfs2_dirty_inode(struct inode *inode, int flags)int need_endtrans =0 ;int ret; -if (!(flags & (I_DIRTY_DATASYNC |I_DIRTY_SYNC ))) +if (!(flags &I_DIRTY_INODE ))return ;if (unlikely (test_bit (SDF_SHUTDOWN , &sdp->sd_flags)))return ;include/linux/fs.h +2
-1@@ -2014,7 +2014,8 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp)#define I_WB_SWITCH (1 << 13)#define I_OVL_INUSE (1 << 14) -#define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES) +#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC) +#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)#define I_DIRTY_ALL (I_DIRTY | I_DIRTY_TIME)extern void __mark_inode_dirty (struct inode *,int );Signature · 1 line
2.14.2
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Steven Whitehouse
Acked-byQuoted 2 lines · Christoph Hellwig
Move
I_DIRTY_INODEtofs.h, and use the I_DIRTY* defines more consistently.
Thanks - looks good to me:
Steve.
Quoted 1 line · Christoph Hellwig
Move
I_DIRTY_INODEtofs.h, and use the I_DIRTY* defines more consistently.
Al, are you going to pick this up?