Commit 29bc0dd0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: cleanup xfs_ilock_iocb_for_write 



Move the relock path out of the straight line and add a comment
explaining why it exists.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 8626b67a

fs/xfs/xfs_file.c

+11 −7
Original line number Diff line number Diff line
@@ -213,16 +213,20 @@ xfs_ilock_iocb_for_write( 
	if (ret)

		return ret;



	if (*lock_mode == XFS_IOLOCK_EXCL)

		return 0;

	if (!xfs_iflags_test(ip, XFS_IREMAPPING))

		return 0;



	/*

	 * If a reflink remap is in progress we always need to take the iolock

	 * exclusively to wait for it to finish.

	 */

	if (*lock_mode == XFS_IOLOCK_SHARED &&

	    xfs_iflags_test(ip, XFS_IREMAPPING)) {

		xfs_iunlock(ip, *lock_mode);

		*lock_mode = XFS_IOLOCK_EXCL;

		return xfs_ilock_iocb(iocb, *lock_mode);

	}



	return 0;

}



static unsigned int

xfs_ilock_for_write_fault(

	struct xfs_inode	*ip)