xfs: add missing cmap->br_state = XFS_EXT_NORM update
authorGao Xiang <hsiangkao@linux.alibaba.com>
Sat, 26 Feb 2022 00:18:30 +0000 (16:18 -0800)
committerDarrick J. Wong <djwong@kernel.org>
Wed, 9 Mar 2022 18:32:06 +0000 (10:32 -0800)
COW extents are already converted into written real extents after
xfs_reflink_convert_cow_locked(), therefore cmap->br_state should
reflect it.

Otherwise, there is another necessary unwritten convertion
triggered in xfs_dio_write_end_io() for direct I/O cases.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
fs/xfs/xfs_reflink.c

index db70060e7bf6648e13de4a0830a0e95cc36ce671..54e68e5693fdcca3b5c86a05fadb0ee0ff0ab508 100644 (file)
@@ -425,7 +425,10 @@ convert:
        if (!convert_now || cmap->br_state == XFS_EXT_NORM)
                return 0;
        trace_xfs_reflink_convert_cow(ip, cmap);
-       return xfs_reflink_convert_cow_locked(ip, offset_fsb, count_fsb);
+       error = xfs_reflink_convert_cow_locked(ip, offset_fsb, count_fsb);
+       if (!error)
+               cmap->br_state = XFS_EXT_NORM;
+       return error;
 
 out_trans_cancel:
        xfs_trans_cancel(tp);