Commit 0596a904 authored Jun 14, 2016 by Filipe Manana

Btrfs: add missing check for writeback errors on fsync

When we start an fsync we start ordered extents for all delalloc ranges.
However before attempting to log the inode, we only wait for those ordered
extents if we are not doing a full sync (bit BTRFS_INODE_NEEDS_FULL_SYNC
is set in the inode's flags). This means that if an ordered extent
completes with an IO error before we check if we can skip logging the
inode, we will not catch and report the IO error to user space. This is
because on an IO error, when the ordered extent completes we do not
update the inode, so if the inode was not previously updated by the
current transaction we end up not logging it through calls to fsync and
therefore not check its mapping flags for the presence of IO errors.

Fix this by checking for errors in the flags of the inode's mapping when
we notice we can skip logging the inode.

This caused sporadic failures in the test generic/331 (which explicitly
tests for IO errors during an fsync call).

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>

parent 8b8b08cb

fs/btrfs/file.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2033,6 +2033,14 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
	*/		*/
	clear_bit(BTRFS_INODE_NEEDS_FULL_SYNC,		clear_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
	&BTRFS_I(inode)->runtime_flags);		&BTRFS_I(inode)->runtime_flags);
			/*
			* An ordered extent might have started before and completed
			* already with io errors, in which case the inode was not
			* updated and we end up here. So check the inode's mapping
			* flags for any errors that might have happened while doing
			* writeback of file data.
			*/
			ret = btrfs_inode_check_errors(inode);
	inode_unlock(inode);		inode_unlock(inode);
	goto out;		goto out;
	}		}

Admin message