The analsysi and fix look correct, but I wonder if it wouldn't be better if we don't expand the number of iomap ops even further and just check for IOMAP_FAULT to not be set in flags in xfs_buffered_write_iomap_end. Either way: Reviewed-by: Christoph Hellwig <hch@xxxxxx>