From: Eric Biggers <ebiggers@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>, Christoph Hellwig <hch@lst.de> Subject: [PATCH 03/13] fs: only specify I_DIRTY_TIME when needed in generic_update_time() Date: Mon, 4 Jan 2021 16:54:42 -0800 [thread overview] Message-ID: <20210105005452.92521-4-ebiggers@kernel.org> (raw) In-Reply-To: <20210105005452.92521-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> generic_update_time() always passes I_DIRTY_TIME to __mark_inode_dirty(), which doesn't really make sense because (a) generic_update_time() might be asked to do only an i_version update, not also a timestamps update; and (b) I_DIRTY_TIME is only supposed to be set in i_state if the filesystem has lazytime enabled, so using it unconditionally in generic_update_time() is inconsistent. As a result there is a weird edge case where if only an i_version update was requested (not also a timestamps update) but it is no longer needed (i.e. inode_maybe_inc_iversion() returns false), then I_DIRTY_TIME will be set in i_state even if the filesystem isn't mounted with lazytime. Fix this by only passing I_DIRTY_TIME to __mark_inode_dirty() if the timestamps were updated and the filesystem has lazytime enabled. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/inode.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 6442d97d9a4ab..d0fa43d8e9d5c 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1743,24 +1743,26 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, int generic_update_time(struct inode *inode, struct timespec64 *time, int flags) { - int iflags = I_DIRTY_TIME; - bool dirty = false; - - if (flags & S_ATIME) - inode->i_atime = *time; - if (flags & S_VERSION) - dirty = inode_maybe_inc_iversion(inode, false); - if (flags & S_CTIME) - inode->i_ctime = *time; - if (flags & S_MTIME) - inode->i_mtime = *time; - if ((flags & (S_ATIME | S_CTIME | S_MTIME)) && - !(inode->i_sb->s_flags & SB_LAZYTIME)) - dirty = true; - - if (dirty) - iflags |= I_DIRTY_SYNC; - __mark_inode_dirty(inode, iflags); + int dirty_flags = 0; + + if (flags & (S_ATIME | S_CTIME | S_MTIME)) { + if (flags & S_ATIME) + inode->i_atime = *time; + if (flags & S_CTIME) + inode->i_ctime = *time; + if (flags & S_MTIME) + inode->i_mtime = *time; + + if (inode->i_sb->s_flags & SB_LAZYTIME) + dirty_flags |= I_DIRTY_TIME; + else + dirty_flags |= I_DIRTY_SYNC; + } + + if ((flags & S_VERSION) && inode_maybe_inc_iversion(inode, false)) + dirty_flags |= I_DIRTY_SYNC; + + __mark_inode_dirty(inode, dirty_flags); return 0; } EXPORT_SYMBOL(generic_update_time); -- 2.30.0
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>, Christoph Hellwig <hch@lst.de>, linux-f2fs-devel@lists.sourceforge.net Subject: [f2fs-dev] [PATCH 03/13] fs: only specify I_DIRTY_TIME when needed in generic_update_time() Date: Mon, 4 Jan 2021 16:54:42 -0800 [thread overview] Message-ID: <20210105005452.92521-4-ebiggers@kernel.org> (raw) In-Reply-To: <20210105005452.92521-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> generic_update_time() always passes I_DIRTY_TIME to __mark_inode_dirty(), which doesn't really make sense because (a) generic_update_time() might be asked to do only an i_version update, not also a timestamps update; and (b) I_DIRTY_TIME is only supposed to be set in i_state if the filesystem has lazytime enabled, so using it unconditionally in generic_update_time() is inconsistent. As a result there is a weird edge case where if only an i_version update was requested (not also a timestamps update) but it is no longer needed (i.e. inode_maybe_inc_iversion() returns false), then I_DIRTY_TIME will be set in i_state even if the filesystem isn't mounted with lazytime. Fix this by only passing I_DIRTY_TIME to __mark_inode_dirty() if the timestamps were updated and the filesystem has lazytime enabled. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/inode.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index 6442d97d9a4ab..d0fa43d8e9d5c 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1743,24 +1743,26 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, int generic_update_time(struct inode *inode, struct timespec64 *time, int flags) { - int iflags = I_DIRTY_TIME; - bool dirty = false; - - if (flags & S_ATIME) - inode->i_atime = *time; - if (flags & S_VERSION) - dirty = inode_maybe_inc_iversion(inode, false); - if (flags & S_CTIME) - inode->i_ctime = *time; - if (flags & S_MTIME) - inode->i_mtime = *time; - if ((flags & (S_ATIME | S_CTIME | S_MTIME)) && - !(inode->i_sb->s_flags & SB_LAZYTIME)) - dirty = true; - - if (dirty) - iflags |= I_DIRTY_SYNC; - __mark_inode_dirty(inode, iflags); + int dirty_flags = 0; + + if (flags & (S_ATIME | S_CTIME | S_MTIME)) { + if (flags & S_ATIME) + inode->i_atime = *time; + if (flags & S_CTIME) + inode->i_ctime = *time; + if (flags & S_MTIME) + inode->i_mtime = *time; + + if (inode->i_sb->s_flags & SB_LAZYTIME) + dirty_flags |= I_DIRTY_TIME; + else + dirty_flags |= I_DIRTY_SYNC; + } + + if ((flags & S_VERSION) && inode_maybe_inc_iversion(inode, false)) + dirty_flags |= I_DIRTY_SYNC; + + __mark_inode_dirty(inode, dirty_flags); return 0; } EXPORT_SYMBOL(generic_update_time); -- 2.30.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2021-01-05 0:56 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-05 0:54 [PATCH 00/13] lazytime fixes and cleanups Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-05 0:54 ` [PATCH 01/13] fs: avoid double-writing inodes on lazytime expiration Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-07 14:47 ` Jan Kara 2021-01-07 14:58 ` Matthew Wilcox 2021-01-07 14:58 ` [f2fs-dev] " Matthew Wilcox 2021-01-07 21:46 ` Eric Biggers 2021-01-07 21:46 ` [f2fs-dev] " Eric Biggers 2021-01-08 8:54 ` Christoph Hellwig 2021-01-08 8:54 ` [f2fs-dev] " Christoph Hellwig 2021-01-08 9:01 ` Christoph Hellwig 2021-01-08 9:01 ` [f2fs-dev] " Christoph Hellwig 2021-01-09 17:11 ` Eric Biggers 2021-01-09 17:11 ` [f2fs-dev] " Eric Biggers 2021-01-05 0:54 ` [PATCH 02/13] gfs2: don't worry about I_DIRTY_TIME in gfs2_fsync() Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-08 8:54 ` Christoph Hellwig 2021-01-08 8:54 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` Eric Biggers [this message] 2021-01-05 0:54 ` [f2fs-dev] [PATCH 03/13] fs: only specify I_DIRTY_TIME when needed in generic_update_time() Eric Biggers 2021-01-08 8:57 ` Christoph Hellwig 2021-01-08 8:57 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 04/13] fat: only specify I_DIRTY_TIME when needed in fat_update_time() Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-07 13:13 ` Jan Kara 2021-01-07 13:13 ` [f2fs-dev] " Jan Kara 2021-01-07 19:10 ` Eric Biggers 2021-01-07 19:10 ` [f2fs-dev] " Eric Biggers 2021-01-05 0:54 ` [PATCH 05/13] fs: don't call ->dirty_inode for lazytime timestamp updates Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-07 13:17 ` Jan Kara 2021-01-07 13:17 ` [f2fs-dev] " Jan Kara 2021-01-07 13:18 ` Jan Kara 2021-01-07 13:18 ` [f2fs-dev] " Jan Kara 2021-01-08 9:02 ` Christoph Hellwig 2021-01-08 9:02 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 06/13] fs: pass only I_DIRTY_INODE flags to ->dirty_inode Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-08 9:02 ` Christoph Hellwig 2021-01-08 9:02 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 07/13] fs: correctly document the inode dirty flags Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-08 9:03 ` Christoph Hellwig 2021-01-08 9:03 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 08/13] ext4: simplify i_state checks in __ext4_update_other_inode_time() Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-07 13:24 ` Jan Kara 2021-01-07 13:24 ` [f2fs-dev] " Jan Kara 2021-01-07 19:06 ` Eric Biggers 2021-01-07 19:06 ` [f2fs-dev] " Eric Biggers 2021-01-05 0:54 ` [PATCH 09/13] fs: drop redundant checks from __writeback_single_inode() Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-08 9:12 ` Christoph Hellwig 2021-01-08 9:12 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 10/13] fs: clean up __mark_inode_dirty() a bit Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-08 9:10 ` Christoph Hellwig 2021-01-08 9:10 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 11/13] fs: add a lazytime_expired method Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-07 14:02 ` Jan Kara 2021-01-07 14:02 ` [f2fs-dev] " Jan Kara 2021-01-07 22:05 ` Eric Biggers 2021-01-07 22:05 ` [f2fs-dev] " Eric Biggers 2021-01-08 9:14 ` Christoph Hellwig 2021-01-08 9:14 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 12/13] xfs: remove a stale comment from xfs_file_aio_write_checks() Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers 2021-01-08 9:15 ` Christoph Hellwig 2021-01-08 9:15 ` [f2fs-dev] " Christoph Hellwig 2021-01-05 0:54 ` [PATCH 13/13] xfs: implement lazytime_expired Eric Biggers 2021-01-05 0:54 ` [f2fs-dev] " Eric Biggers
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210105005452.92521-4-ebiggers@kernel.org \ --to=ebiggers@kernel.org \ --cc=hch@lst.de \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=tytso@mit.edu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.