Эх сурвалжийг харах

fs: don't clear I_DIRTY_TIME before calling mark_inode_dirty_sync

__mark_inode_dirty already takes care of that, and for the XFS lazytime
implementation we need to know that ->dirty_inode was called because
I_DIRTY_TIME was set.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Christoph Hellwig 7 жил өмнө
parent
commit
0d07e5573f
2 өөрчлөгдсөн 1 нэмэгдсэн , 6 устгасан
  1. 0 1
      fs/inode.c
  2. 1 5
      fs/sync.c

+ 0 - 1
fs/inode.c

@@ -1533,7 +1533,6 @@ retry:
 	if (atomic_dec_and_lock(&inode->i_count, &inode->i_lock)) {
 	if (atomic_dec_and_lock(&inode->i_count, &inode->i_lock)) {
 		if (inode->i_nlink && (inode->i_state & I_DIRTY_TIME)) {
 		if (inode->i_nlink && (inode->i_state & I_DIRTY_TIME)) {
 			atomic_inc(&inode->i_count);
 			atomic_inc(&inode->i_count);
-			inode->i_state &= ~I_DIRTY_TIME;
 			spin_unlock(&inode->i_lock);
 			spin_unlock(&inode->i_lock);
 			trace_writeback_lazytime_iput(inode);
 			trace_writeback_lazytime_iput(inode);
 			mark_inode_dirty_sync(inode);
 			mark_inode_dirty_sync(inode);

+ 1 - 5
fs/sync.c

@@ -187,12 +187,8 @@ int vfs_fsync_range(struct file *file, loff_t start, loff_t end, int datasync)
 
 
 	if (!file->f_op->fsync)
 	if (!file->f_op->fsync)
 		return -EINVAL;
 		return -EINVAL;
-	if (!datasync && (inode->i_state & I_DIRTY_TIME)) {
-		spin_lock(&inode->i_lock);
-		inode->i_state &= ~I_DIRTY_TIME;
-		spin_unlock(&inode->i_lock);
+	if (!datasync && (inode->i_state & I_DIRTY_TIME))
 		mark_inode_dirty_sync(inode);
 		mark_inode_dirty_sync(inode);
-	}
 	return file->f_op->fsync(file, start, end, datasync);
 	return file->f_op->fsync(file, start, end, datasync);
 }
 }
 EXPORT_SYMBOL(vfs_fsync_range);
 EXPORT_SYMBOL(vfs_fsync_range);