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

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

xfs: assert that we hold the ilock for extent map access 



Make sure that xfs_bmapi_read has the ilock held in some way, and that
xfs_bmapi_write, xfs_bmapi_delay, xfs_bunmapi and xfs_iread_extents are
called with the ilock held exclusively.

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

fs/xfs/xfs_bmap.c

+4 −0
Original line number Diff line number Diff line
@@ -4002,6 +4002,7 @@ xfs_bmapi_read( 
	ASSERT(*nmap >= 1);

	ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK|XFS_BMAPI_ENTIRE|

			   XFS_BMAPI_IGSTATE)));

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL));



	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
@@ -4196,6 +4197,7 @@ xfs_bmapi_delay( 
	ASSERT(*nmap >= 1);

	ASSERT(*nmap <= XFS_BMAP_MAX_NMAP);

	ASSERT(!(flags & ~XFS_BMAPI_ENTIRE));

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));



	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_EXTENTS &&
@@ -4489,6 +4491,7 @@ xfs_bmapi_write( 
	ASSERT(tp != NULL);

	ASSERT(len > 0);

	ASSERT(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_LOCAL);

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));



	if (unlikely(XFS_TEST_ERROR(

	    (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
@@ -5040,6 +5043,7 @@ xfs_bunmapi( 
	if (XFS_FORCED_SHUTDOWN(mp))

		return XFS_ERROR(EIO);



	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));

	ASSERT(len > 0);

	ASSERT(nexts >= 0);

fs/xfs/xfs_inode_fork.c

+2 −0
Original line number Diff line number Diff line
@@ -431,6 +431,8 @@ xfs_iread_extents( 
	xfs_ifork_t	*ifp;

	xfs_extnum_t	nextents;



	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));



	if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {

		XFS_ERROR_REPORT("xfs_iread_extents", XFS_ERRLEVEL_LOW,

				 ip->i_mount);