From: Yingping Lu Date: Wed, 11 Jan 2006 04:29:39 +0000 (+1100) Subject: [XFS] Fixed an assertion failure in xfs_reclaim caused by delayed block. X-Git-Tag: v2.6.16-rc1~185^2~41 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1661dc8e7a2c6aeb8f2fb6a8197909c95c220a71;p=linux-2.6 [XFS] Fixed an assertion failure in xfs_reclaim caused by delayed block. The assertion failure came from XFS QA41. The fix is done by enabling truncate for delayed block in xfs_inactive. SGI-PV: 945412 SGI-Modid: xfs-linux-melb:xfs-kern:202521a Signed-off-by: Yingping Lu Signed-off-by: Nathan Scott --- diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index a2b422c984..f6aed9ef6a 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -1612,7 +1612,8 @@ xfs_inactive( * only one with a reference to the inode. */ truncate = ((ip->i_d.di_nlink == 0) && - ((ip->i_d.di_size != 0) || (ip->i_d.di_nextents > 0)) && + ((ip->i_d.di_size != 0) || (ip->i_d.di_nextents > 0) || + (ip->i_delayed_blks > 0)) && ((ip->i_d.di_mode & S_IFMT) == S_IFREG)); mp = ip->i_mount;