diff options
author | Dave Chinner <dchinner@redhat.com> | 2012-04-23 01:58:47 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2012-05-14 17:20:43 -0400 |
commit | ead360c50d33772f45943792893a58865adf3638 (patch) | |
tree | 08f737048596c1460c93428b7884f5bdc4732579 /fs/xfs | |
parent | 0e95f19ad983e72a9cb93a67b3290b58f0467b36 (diff) |
xfs: fix incorrect b_offset initialisation
Because we no longer use the page cache for buffering, there is no
direct block number to page offset relationship anymore.
xfs_buf_get_pages is still setting up b_offset as if there was some
relationship, and that is leading to incorrectly setting up
*uncached* buffers that don't overwrite b_offset once they've had
pages allocated.
For cached buffers, the first block of the buffer is always at offset
zero into the allocated memory. This is true for sub-page sized
buffers, as well as for multiple-page buffers.
For uncached buffers, b_offset is only non-zero when we are
associating specific memory to the buffers, and that is set
correctly by the code setting up the buffer.
Hence remove the setting of b_offset in xfs_buf_get_pages, because
it is now always the wrong thing to do.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_buf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 86d9af70ab3b..ddfc58f40506 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
@@ -227,7 +227,6 @@ _xfs_buf_get_pages( | |||
227 | { | 227 | { |
228 | /* Make sure that we have a page list */ | 228 | /* Make sure that we have a page list */ |
229 | if (bp->b_pages == NULL) { | 229 | if (bp->b_pages == NULL) { |
230 | bp->b_offset = xfs_buf_poff(bp->b_file_offset); | ||
231 | bp->b_page_count = page_count; | 230 | bp->b_page_count = page_count; |
232 | if (page_count <= XB_PAGES) { | 231 | if (page_count <= XB_PAGES) { |
233 | bp->b_pages = bp->b_page_array; | 232 | bp->b_pages = bp->b_page_array; |