|
@@ -172,6 +172,12 @@ xfs_setfilesize_ioend(
|
|
|
current_set_flags_nested(&tp->t_pflags, PF_FSTRANS);
|
|
|
__sb_writers_acquired(VFS_I(ip)->i_sb, SB_FREEZE_FS);
|
|
|
|
|
|
+ /* we abort the update if there was an IO error */
|
|
|
+ if (ioend->io_error) {
|
|
|
+ xfs_trans_cancel(tp);
|
|
|
+ return ioend->io_error;
|
|
|
+ }
|
|
|
+
|
|
|
return xfs_setfilesize(ip, tp, ioend->io_offset, ioend->io_size);
|
|
|
}
|
|
|
|
|
@@ -212,14 +218,17 @@ xfs_end_io(
|
|
|
ioend->io_error = -EIO;
|
|
|
goto done;
|
|
|
}
|
|
|
- if (ioend->io_error)
|
|
|
- goto done;
|
|
|
|
|
|
/*
|
|
|
* For unwritten extents we need to issue transactions to convert a
|
|
|
* range to normal written extens after the data I/O has finished.
|
|
|
+ * Detecting and handling completion IO errors is done individually
|
|
|
+ * for each case as different cleanup operations need to be performed
|
|
|
+ * on error.
|
|
|
*/
|
|
|
if (ioend->io_type == XFS_IO_UNWRITTEN) {
|
|
|
+ if (ioend->io_error)
|
|
|
+ goto done;
|
|
|
error = xfs_iomap_write_unwritten(ip, ioend->io_offset,
|
|
|
ioend->io_size);
|
|
|
} else if (ioend->io_append_trans) {
|