diff options
| author | Nathan Scott <nathans@sgi.com> | 2005-09-05 10:06:55 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-09-05 10:06:55 +1000 |
| commit | c31e887807a3eab26614ee142629ba447cbcc0dc (patch) | |
| tree | cb62912731e2fb0e2afde311c5bdc12d018df179 /fs | |
| parent | a3c476d8a19ded7c5f1e17ea07df377764d9d1d3 (diff) | |
| download | kernel-crypto-c31e887807a3eab26614ee142629ba447cbcc0dc.tar.gz kernel-crypto-c31e887807a3eab26614ee142629ba447cbcc0dc.tar.xz kernel-crypto-c31e887807a3eab26614ee142629ba447cbcc0dc.zip | |
[XFS] Fix incorrect use of BMAPI_READ in unwritten extent handling
(luckily just cosmetic).
SGI-PV: 942232
SGI-Modid: xfs-linux-melb:xfs-kern:23718a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_iomap.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index ea615e2f476..c6c077978fe 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c @@ -804,7 +804,7 @@ xfs_page_state_convert( continue; if (!iomp) { err = xfs_map_blocks(inode, offset, len, &iomap, - BMAPI_READ|BMAPI_IGNSTATE); + BMAPI_WRITE|BMAPI_IGNSTATE); if (err) { goto error; } diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 44999d557d8..d0f5be63cdd 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -226,13 +226,12 @@ xfs_iomap( xfs_iomap_enter_trace(XFS_IOMAP_READ_ENTER, io, offset, count); lockmode = XFS_LCK_MAP_SHARED(mp, io); bmapi_flags = XFS_BMAPI_ENTIRE; - if (flags & BMAPI_IGNSTATE) - bmapi_flags |= XFS_BMAPI_IGSTATE; break; case BMAPI_WRITE: xfs_iomap_enter_trace(XFS_IOMAP_WRITE_ENTER, io, offset, count); lockmode = XFS_ILOCK_EXCL|XFS_EXTSIZE_WR; - bmapi_flags = 0; + if (flags & BMAPI_IGNSTATE) + bmapi_flags |= XFS_BMAPI_IGSTATE|XFS_BMAPI_ENTIRE; XFS_ILOCK(mp, io, lockmode); break; case BMAPI_ALLOCATE: |