On Thu 22-02-18 07:29:56, Christoph Hellwig wrote:
> __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@xxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/inode.c | 1 -
> fs/sync.c | 6 +-----
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/fs/inode.c b/fs/inode.c
> index ef362364d396..6295f1415761 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -1533,7 +1533,6 @@ void iput(struct inode *inode)
> if (atomic_dec_and_lock(&inode->i_count, &inode->i_lock)) {
> if (inode->i_nlink && (inode->i_state & I_DIRTY_TIME)) {
> atomic_inc(&inode->i_count);
> - inode->i_state &= ~I_DIRTY_TIME;
> spin_unlock(&inode->i_lock);
> trace_writeback_lazytime_iput(inode);
> mark_inode_dirty_sync(inode);
> diff --git a/fs/sync.c b/fs/sync.c
> index 6e0a2cbaf6de..09f0259724ff 100644
> --- a/fs/sync.c
> +++ b/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)
> 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);
> - }
> return file->f_op->fsync(file, start, end, datasync);
> }
> EXPORT_SYMBOL(vfs_fsync_range);
> --
> 2.14.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
