Commit 1d4352de authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: minor cleanup for xfs_get_blocks 



Simplify the control flow a bit in preparation for O_ATOMIC-related
changes.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent f5c54717

fs/xfs/xfs_aops.c

+6 −7
Original line number Diff line number Diff line
@@ -1335,16 +1335,15 @@ xfs_get_blocks( 
			&nimaps, 0);

	if (error)

		goto out_unlock;

	if (!nimaps) {

		trace_xfs_get_blocks_notfound(ip, offset, size);

		goto out_unlock;

	}



	if (nimaps) {

	trace_xfs_get_blocks_found(ip, offset, size,

		imap.br_state == XFS_EXT_UNWRITTEN ?

			XFS_IO_UNWRITTEN : XFS_IO_OVERWRITE, &imap);

	xfs_iunlock(ip, lockmode);

	} else {

		trace_xfs_get_blocks_notfound(ip, offset, size);

		goto out_unlock;

	}



	/* trim mapping down to size requested */

	xfs_map_trim_size(inode, iblock, bh_result, &imap, offset, size);