diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-04-28 12:28:53 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-05-19 09:58:17 -0500 |
| commit | 9563b3d8998c78d5b7e718b546d5f68037c494fe (patch) | |
| tree | f614d05139491b129515443855e80eb0c562157b /fs/xfs/linux-2.6 | |
| parent | 046f1685bb5211c3dea74fda0198c19171e9abc9 (diff) | |
| download | op-kernel-dev-9563b3d8998c78d5b7e718b546d5f68037c494fe.zip op-kernel-dev-9563b3d8998c78d5b7e718b546d5f68037c494fe.tar.gz | |
xfs: remove iomap_delta
The iomap_delta field in struct xfs_iomap just contains the
difference between the offset passed to xfs_iomap and the
iomap_offset. Just calculate it in the only caller that cares.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 49dec21..577d0b4 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c @@ -1512,9 +1512,11 @@ __xfs_get_blocks( } if (direct || size > (1 << inode->i_blkbits)) { - ASSERT(iomap.iomap_bsize - iomap.iomap_delta > 0); + xfs_off_t iomap_delta = offset - iomap.iomap_offset; + + ASSERT(iomap.iomap_bsize - iomap_delta > 0); offset = min_t(xfs_off_t, - iomap.iomap_bsize - iomap.iomap_delta, size); + iomap.iomap_bsize - iomap_delta, size); bh_result->b_size = (ssize_t)min_t(xfs_off_t, LONG_MAX, offset); } |
