Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf1f262 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: always return with the iolock held from xfs_file_aio_write_checks 



While xfs_iunlock is fine with 0 lockflags the calling conventions are much
cleaner if xfs_file_aio_write_checks never returns without the iolock held.

Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 2813d682

fs/xfs/xfs_file.c

+4 −3
Original line number Diff line number Diff line
@@ -636,7 +636,9 @@ xfs_zero_eof( 
/*

 * Common pre-write limit and setup checks.

 *

 * Returns with iolock held according to @iolock.

 * Called with the iolocked held either shared and exclusive according to

 * @iolock, and returns with it held.  Might upgrade the iolock to exclusive

 * if called for a direct write beyond i_size.

 */

STATIC ssize_t

xfs_file_aio_write_checks(
@@ -653,8 +655,7 @@ xfs_file_aio_write_checks( 
restart:

	error = generic_write_checks(file, pos, count, S_ISBLK(inode->i_mode));

	if (error) {

		xfs_rw_iunlock(ip, XFS_ILOCK_EXCL | *iolock);

		*iolock = 0;

		xfs_rw_iunlock(ip, XFS_ILOCK_EXCL);

		return error;

	}