[PATCH 04/10] fs: factor out a mark_inode_dirty_time helper
Christoph Hellwig <[email protected]>
| Newsgroups | dev.linux.lists.gfs2,org.infradead.lists.linux-mtd,org.kernel.vger.io-uring,org.kernel.vger.linux-btrfs,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs,org.kernel.vger.linux-unionfs,org.kernel.vger.linux-xfs |
|---|---|
| Message-ID | <[email protected]> |
Factor out the inode dirtying vs lazytime logic from generic_update_time into a new helper so that it can be reused in file system methods. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Jan Kara <[email protected]> Reviewed-by: Chaitanya Kulkarni <[email protected]> Reviewed-by: Jeff Layton <[email protected]> --- fs/fs-writeback.c | 16 ++++++++++++++++ fs/inode.c | 14 +++----------- include/linux/fs.h | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 6800886c4d10..7870c158e4a2 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -2692,6 +2692,22 @@ void __mark_inode_dirty(struct inode *inode, int flags) } EXPORT_SYMBOL(__mark_inode_dirty); +void mark_inode_dirty_time(struct inode *inode, unsigned int flags) +{ + if (inode->i_sb->s_flags & SB_LAZYTIME) { + int dirty_flags = 0; + + if (flags & (S_ATIME | S_MTIME | S_CTIME)) + dirty_flags = I_DIRTY_TIME; + if (flags & S_VERSION) + dirty_flags |= I_DIRTY_SYNC; + __mark_inode_dirty(inode, dirty_flags); + } else { + mark_inode_dirty_sync(inode); + } +} +EXPORT_SYMBOL_GPL(mark_inode_dirty_time); + /* * The @s_sync_lock is used to serialise concurrent sync operations * to avoid lock contention problems with concurrent wait_sb_inodes() calls. diff --git a/fs/inode.c b/fs/inode.c index 876641a6e478..17ecb7bb5067 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2145,17 +2145,9 @@ EXPORT_SYMBOL(inode_update_timestamps); */ int generic_update_time(struct inode *inode, int flags) { - int updated = inode_update_timestamps(inode, flags); - int dirty_flags = 0; - - if (!updated) - return 0; - - if (updated & (S_ATIME|S_MTIME|S_CTIME)) - dirty_flags = inode->i_sb->s_flags & SB_LAZYTIME ? I_DIRTY_TIME : I_DIRTY_SYNC; - if (updated & S_VERSION) - dirty_flags |= I_DIRTY_SYNC; - __mark_inode_dirty(inode, dirty_flags); + flags = inode_update_timestamps(inode, flags); + if (flags) + mark_inode_dirty_time(inode, flags); return 0; } EXPORT_SYMBOL(generic_update_time); diff --git a/include/linux/fs.h b/include/linux/fs.h index fccb0a38cb74..66d3d18cf4e3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2189,7 +2189,8 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src, }; } -extern void __mark_inode_dirty(struct inode *, int); +void mark_inode_dirty_time(struct inode *inode, unsigned int flags); +void __mark_inode_dirty(struct inode *inode, int flags); static inline void mark_inode_dirty(struct inode *inode) { __mark_inode_dirty(inode, I_DIRTY); -- 2.47.3