All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: linux-fsdevel@vger.kernel.org
Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net,
	Theodore Ts'o <tytso@mit.edu>, Christoph Hellwig <hch@lst.de>,
	Jan Kara <jack@suse.cz>
Subject: [PATCH v3 04/11] fat: only specify I_DIRTY_TIME when needed in fat_update_time()
Date: Tue, 12 Jan 2021 11:02:46 -0800	[thread overview]
Message-ID: <20210112190253.64307-5-ebiggers@kernel.org> (raw)
In-Reply-To: <20210112190253.64307-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

As was done for generic_update_time(), only pass I_DIRTY_TIME to
__mark_inode_dirty() when the inode's timestamps were actually updated
and lazytime is enabled.  This avoids a weird edge case where
I_DIRTY_TIME could be set in i_state when lazytime isn't enabled.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/fat/misc.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index f1b2a1fc2a6a4..18a50a46b57f8 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -329,22 +329,23 @@ EXPORT_SYMBOL_GPL(fat_truncate_time);
 
 int fat_update_time(struct inode *inode, struct timespec64 *now, int flags)
 {
-	int iflags = I_DIRTY_TIME;
-	bool dirty = false;
+	int dirty_flags = 0;
 
 	if (inode->i_ino == MSDOS_ROOT_INO)
 		return 0;
 
-	fat_truncate_time(inode, now, flags);
-	if (flags & S_VERSION)
-		dirty = inode_maybe_inc_iversion(inode, false);
-	if ((flags & (S_ATIME | S_CTIME | S_MTIME)) &&
-	    !(inode->i_sb->s_flags & SB_LAZYTIME))
-		dirty = true;
+	if (flags & (S_ATIME | S_CTIME | S_MTIME)) {
+		fat_truncate_time(inode, now, flags);
+		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;
 
-	if (dirty)
-		iflags |= I_DIRTY_SYNC;
-	__mark_inode_dirty(inode, iflags);
+	__mark_inode_dirty(inode, dirty_flags);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(fat_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: Jan Kara <jack@suse.cz>,
	linux-f2fs-devel@lists.sourceforge.net,
	linux-xfs@vger.kernel.org, Theodore Ts'o <tytso@mit.edu>,
	linux-ext4@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: [f2fs-dev] [PATCH v3 04/11] fat: only specify I_DIRTY_TIME when needed in fat_update_time()
Date: Tue, 12 Jan 2021 11:02:46 -0800	[thread overview]
Message-ID: <20210112190253.64307-5-ebiggers@kernel.org> (raw)
In-Reply-To: <20210112190253.64307-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

As was done for generic_update_time(), only pass I_DIRTY_TIME to
__mark_inode_dirty() when the inode's timestamps were actually updated
and lazytime is enabled.  This avoids a weird edge case where
I_DIRTY_TIME could be set in i_state when lazytime isn't enabled.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 fs/fat/misc.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index f1b2a1fc2a6a4..18a50a46b57f8 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -329,22 +329,23 @@ EXPORT_SYMBOL_GPL(fat_truncate_time);
 
 int fat_update_time(struct inode *inode, struct timespec64 *now, int flags)
 {
-	int iflags = I_DIRTY_TIME;
-	bool dirty = false;
+	int dirty_flags = 0;
 
 	if (inode->i_ino == MSDOS_ROOT_INO)
 		return 0;
 
-	fat_truncate_time(inode, now, flags);
-	if (flags & S_VERSION)
-		dirty = inode_maybe_inc_iversion(inode, false);
-	if ((flags & (S_ATIME | S_CTIME | S_MTIME)) &&
-	    !(inode->i_sb->s_flags & SB_LAZYTIME))
-		dirty = true;
+	if (flags & (S_ATIME | S_CTIME | S_MTIME)) {
+		fat_truncate_time(inode, now, flags);
+		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;
 
-	if (dirty)
-		iflags |= I_DIRTY_SYNC;
-	__mark_inode_dirty(inode, iflags);
+	__mark_inode_dirty(inode, dirty_flags);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(fat_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

  parent reply	other threads:[~2021-01-12 19:05 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-12 19:02 [PATCH v3 00/11] lazytime fix and cleanups Eric Biggers
2021-01-12 19:02 ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 01/11] fs: fix lazytime expiration handling in __writeback_single_inode() Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 02/11] fs: correctly document the inode dirty flags Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 03/11] fs: only specify I_DIRTY_TIME when needed in generic_update_time() Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` Eric Biggers [this message]
2021-01-12 19:02   ` [f2fs-dev] [PATCH v3 04/11] fat: only specify I_DIRTY_TIME when needed in fat_update_time() Eric Biggers
2021-01-12 19:02 ` [PATCH v3 05/11] fs: don't call ->dirty_inode for lazytime timestamp updates Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 06/11] fs: pass only I_DIRTY_INODE flags to ->dirty_inode Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 07/11] fs: clean up __mark_inode_dirty() a bit Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 08/11] fs: drop redundant check from __writeback_single_inode() Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 09/11] fs: improve comments for writeback_single_inode() Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 10/11] gfs2: don't worry about I_DIRTY_TIME in gfs2_fsync() Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-12 19:02 ` [PATCH v3 11/11] ext4: simplify i_state checks in __ext4_update_other_inode_time() Eric Biggers
2021-01-12 19:02   ` [f2fs-dev] " Eric Biggers
2021-01-13  7:07   ` Christoph Hellwig
2021-01-13  7:07     ` [f2fs-dev] " Christoph Hellwig
2021-01-13 16:29 ` [PATCH v3 00/11] lazytime fix and cleanups Jan Kara
2021-01-13 16:29   ` [f2fs-dev] " Jan Kara
2021-01-13 18:49   ` Eric Biggers
2021-01-13 18:49     ` [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=20210112190253.64307-5-ebiggers@kernel.org \
    --to=ebiggers@kernel.org \
    --cc=hch@lst.de \
    --cc=jack@suse.cz \
    --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: link
Be 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.