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

Commit ab1908a5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: fix up asserts in xfs_iflush_fork 



Remove asserts in xfs_iflush_fork that would call xfs_iext_get_ext
with a potentially invalid extent buffer index.

Based on an earlier patch from Lachlan McIlroy.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLachlan McIlroy <lmcilroy@redhat.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent f1c63b73

fs/xfs/xfs_inode.c

+1 −4
Original line number Diff line number Diff line
@@ -2557,12 +2557,9 @@ xfs_iflush_fork( 
	case XFS_DINODE_FMT_EXTENTS:

		ASSERT((ifp->if_flags & XFS_IFEXTENTS) ||

		       !(iip->ili_format.ilf_fields & extflag[whichfork]));

		ASSERT((xfs_iext_get_ext(ifp, 0) != NULL) ||

			(ifp->if_bytes == 0));

		ASSERT((xfs_iext_get_ext(ifp, 0) == NULL) ||

			(ifp->if_bytes > 0));

		if ((iip->ili_format.ilf_fields & extflag[whichfork]) &&

		    (ifp->if_bytes > 0)) {

			ASSERT(xfs_iext_get_ext(ifp, 0));

			ASSERT(XFS_IFORK_NEXTENTS(ip, whichfork) > 0);

			(void)xfs_iextents_copy(ip, (xfs_bmbt_rec_t *)cp,

				whichfork);