| To: | xfs@xxxxxxxxxxx |
|---|---|
| Subject: | [PATCH 8/9] xfs: fix up asserts in xfs_iflush_fork |
| From: | Christoph Hellwig <hch@xxxxxxxxxxxxx> |
| Date: | Wed, 11 May 2011 11:04:10 -0400 |
| References: | <20110511150402.258164661@xxxxxxxxxxxxxxxxxxxxxx> |
| User-agent: | quilt/0.48-1 |
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: Christoph Hellwig <hch@xxxxxx>
Index: xfs/fs/xfs/xfs_inode.c
===================================================================
--- xfs.orig/fs/xfs/xfs_inode.c 2011-05-11 10:18:39.555233397 +0200
+++ xfs/fs/xfs/xfs_inode.c 2011-05-11 12:04:24.099733330 +0200
@@ -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);
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | xfstests: print the message that fallocate is not supported to stdout, Boris Ranto |
|---|---|
| Next by Date: | [PATCH 6/9] xfs: do not use unchecked extent indices in xfs_bunmapi, Christoph Hellwig |
| Previous by Thread: | [PATCH 0/9] extent buffer indexing fixes, Christoph Hellwig |
| Next by Thread: | Re: [PATCH 8/9] xfs: fix up asserts in xfs_iflush_fork, Lachlan McIlroy |
| Indexes: | [Date] [Thread] [Top] [All Lists] |