diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 21:34:37 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 21:34:37 +0100 |
| commit | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch) | |
| tree | 35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /fs/xfs/xfs_iomap.c | |
| parent | 442d207eb0b4e7047c4fedccd900c425e689d502 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
| download | op-kernel-dev-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.zip op-kernel-dev-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.tar.gz | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/xfs/xfs_iomap.c')
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 991f8a6..469e1a7 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; |
