Commit 5cb13dcd authored Oct 12, 2015 by Zhaohongjiang Committed by Dave Chinner Oct 12, 2015

cancel the setfilesize transation when io error happen



When I ran xfstest/073 case, the remount process was blocked to wait
transactions to be zero. I found there was a io error happened, and
the setfilesize transaction was not released properly. We should add
the changes to cancel the io error in this case.

Reproduction steps:
1. dd if=/dev/zero of=xfs1.img bs=1M count=2048
2. mkfs.xfs xfs1.img
3. losetup -f ./xfs1.img /dev/loop0
4. mount -t xfs /dev/loop0 /home/test_dir/
5. mkdir /home/test_dir/test
6. mkfs.xfs -dfile,name=image,size=2g
7. mount -t xfs -o loop image /home/test_dir/test
8. cp a file bigger than 2g to /home/test_dir/test
9. mount -t xfs -o remount,ro /home/test_dir/test

[ dchinner: moved io error detection to xfs_setfilesize_ioend() after
  transaction context restoration. ]

Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

parent 1f93e4a9

fs/xfs/xfs_aops.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -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) {