summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Cattelan <cattelan@sgi.com>2005-05-06 15:42:22 +0200
committerChristoph Hellwig <hch@melbourne.sgi.com>2005-05-06 15:42:22 +0200
commit68d1498c3a7e5223b587ad067111fbed12df52a1 (patch)
tree92b17700c7d6696f84148bd078d83cc377053547
parent[PATCH] ppc64: remove explicit contig_page_data reference (diff)
downloadlinux-68d1498c3a7e5223b587ad067111fbed12df52a1.tar.xz
linux-68d1498c3a7e5223b587ad067111fbed12df52a1.zip
[XFS] Fix a bug in xfs_iomap for extent handling of write cases
This may be the cause of several open PV's of incorrect delay flags being set and then tripping asserts. Do not return a delay alloc extent when the caller is asking to do a write. SGI Modid: xfs-linux:xfs-kern:189616a Signed-off-by: Russell Cattelan <cattelan@sgi.com> Signed-off-by: Christoph Hellwig <hch@sgi.com>
-rw-r--r--fs/xfs/xfs_iomap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 991f8a61f7c4..469e1a7939d4 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -278,7 +278,9 @@ phase2:
switch (flags & (BMAPI_WRITE|BMAPI_ALLOCATE|BMAPI_UNWRITTEN)) {
case BMAPI_WRITE:
/* If we found an extent, return it */
- if (nimaps && (imap.br_startblock != HOLESTARTBLOCK)) {
+ if (nimaps &&
+ (imap.br_startblock != HOLESTARTBLOCK) &&
+ (imap.br_startblock != DELAYSTARTBLOCK)) {
xfs_iomap_map_trace(XFS_IOMAP_WRITE_MAP, io,
offset, count, iomapp, &imap, flags);
break;