diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-05-11 15:04:10 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-05-25 10:48:37 -0500 |
| commit | ab1908a5bb21a8eebf16e5d92d087fd9413cf67d (patch) | |
| tree | 7c8728635209cb8f463c97ba934875fa1388e370 /fs/xfs | |
| parent | f1c63b73cf60dc4800cde5ce7fd9466c419e5e36 (diff) | |
| download | blackbird-op-linux-ab1908a5bb21a8eebf16e5d92d087fd9413cf67d.tar.gz blackbird-op-linux-ab1908a5bb21a8eebf16e5d92d087fd9413cf67d.zip | |
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Lachlan McIlroy <lmcilroy@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index c96bdeda23bb..6f318eeac401 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -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); |
