Message ID | 20210109075903.208222-11-ebiggers@kernel.org (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | lazytime fix and cleanups | expand |
On Fri 08-01-21 23:59:01, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > The I_DIRTY_TIME flag is primary used within the VFS, and there's no > reason for ->fsync() implementations to do anything with it. This is > because when !datasync, the VFS will expire dirty timestamps before > calling ->fsync(). (See vfs_fsync_range().) This turns I_DIRTY_TIME > into I_DIRTY_SYNC. > > Therefore, change gfs2_fsync() to not check for I_DIRTY_TIME. > > Reviewed-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Eric Biggers <ebiggers@google.com> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/gfs2/file.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c > index b39b339feddc9..7fe2497755a37 100644 > --- a/fs/gfs2/file.c > +++ b/fs/gfs2/file.c > @@ -749,7 +749,7 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end, > { > struct address_space *mapping = file->f_mapping; > struct inode *inode = mapping->host; > - int sync_state = inode->i_state & I_DIRTY_ALL; > + int sync_state = inode->i_state & I_DIRTY; > struct gfs2_inode *ip = GFS2_I(inode); > int ret = 0, ret1 = 0; > > @@ -762,7 +762,7 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end, > if (!gfs2_is_jdata(ip)) > sync_state &= ~I_DIRTY_PAGES; > if (datasync) > - sync_state &= ~(I_DIRTY_SYNC | I_DIRTY_TIME); > + sync_state &= ~I_DIRTY_SYNC; > > if (sync_state) { > ret = sync_inode_metadata(inode, 1); > -- > 2.30.0 >
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index b39b339feddc9..7fe2497755a37 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -749,7 +749,7 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end, { struct address_space *mapping = file->f_mapping; struct inode *inode = mapping->host; - int sync_state = inode->i_state & I_DIRTY_ALL; + int sync_state = inode->i_state & I_DIRTY; struct gfs2_inode *ip = GFS2_I(inode); int ret = 0, ret1 = 0; @@ -762,7 +762,7 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end, if (!gfs2_is_jdata(ip)) sync_state &= ~I_DIRTY_PAGES; if (datasync) - sync_state &= ~(I_DIRTY_SYNC | I_DIRTY_TIME); + sync_state &= ~I_DIRTY_SYNC; if (sync_state) { ret = sync_inode_metadata(inode, 1);