redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[XFS] pass full 64bit offsets to xfs_add_to_ioend 

SGI-PV: 947118
SGI-Modid: xfs-linux-melb:xfs-kern:203828a

Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
hifive-unleashed-5.1
Christoph Hellwig 2006-01-11 20:49:16 +11:00 committed by Nathan Scott
parent d5cb48aaac
commit 7336cea8c2
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/xfs/linux-2.6/xfs_aops.c
View File

@ -414,7 +414,7 @@ STATIC void
xfs_add_to_ioend( xfs_add_to_ioend(
struct inode *inode, struct inode *inode,
struct buffer_head *bh, struct buffer_head *bh,
unsigned int p_offset, xfs_off_t offset,
unsigned int type, unsigned int type,
xfs_ioend_t **result, xfs_ioend_t **result,
int need_ioend) int need_ioend)
@ -423,10 +423,7 @@ xfs_add_to_ioend(
if (!ioend || need_ioend || type != ioend->io_type) { if (!ioend || need_ioend || type != ioend->io_type) {
xfs_ioend_t *previous = *result; xfs_ioend_t *previous = *result;
xfs_off_t offset;
offset = (xfs_off_t)bh->b_page->index << PAGE_CACHE_SHIFT;
offset += p_offset;
ioend = xfs_alloc_ioend(inode, type); ioend = xfs_alloc_ioend(inode, type);
ioend->io_offset = offset; ioend->io_offset = offset;
ioend->io_buffer_head = bh; ioend->io_buffer_head = bh;
@ -666,7 +663,6 @@ xfs_convert_page(
p_offset = p_offset ? roundup(p_offset, len) : PAGE_CACHE_SIZE; p_offset = p_offset ? roundup(p_offset, len) : PAGE_CACHE_SIZE;
page_dirty = p_offset / len; page_dirty = p_offset / len;
p_offset = 0;
bh = head = page_buffers(page); bh = head = page_buffers(page);
do { do {
if (offset >= end_offset) if (offset >= end_offset)
@ -694,7 +690,7 @@ xfs_convert_page(
xfs_map_at_offset(bh, offset, bbits, mp); xfs_map_at_offset(bh, offset, bbits, mp);
if (startio) { if (startio) {
xfs_add_to_ioend(inode, bh, p_offset, xfs_add_to_ioend(inode, bh, offset,
type, ioendp, done); type, ioendp, done);
} else { } else {
set_buffer_dirty(bh); set_buffer_dirty(bh);
@ -707,7 +703,7 @@ xfs_convert_page(
type = 0; type = 0;
if (buffer_mapped(bh) && all_bh && startio) { if (buffer_mapped(bh) && all_bh && startio) {
lock_buffer(bh); lock_buffer(bh);
xfs_add_to_ioend(inode, bh, p_offset, xfs_add_to_ioend(inode, bh, offset,
type, ioendp, done); type, ioendp, done);
count++; count++;
page_dirty--; page_dirty--;
@ -715,8 +711,7 @@ xfs_convert_page(
done = 1; done = 1;
} }
} }
} while (offset += len, p_offset += len, } while (offset += len, (bh = bh->b_this_page) != head);
(bh = bh->b_this_page) != head);
if (uptodate && bh == head) if (uptodate && bh == head)
SetPageUptodate(page); SetPageUptodate(page);
@ -914,7 +909,7 @@ xfs_page_state_convert(
xfs_map_at_offset(bh, offset, xfs_map_at_offset(bh, offset,
inode->i_blkbits, &iomap); inode->i_blkbits, &iomap);
if (startio) { if (startio) {
xfs_add_to_ioend(inode, bh, p_offset, xfs_add_to_ioend(inode, bh, offset,
type, &ioend, type, &ioend,
!iomap_valid); !iomap_valid);
} else { } else {
@ -930,8 +925,7 @@ xfs_page_state_convert(
if (!test_and_set_bit(BH_Lock, &bh->b_state)) { if (!test_and_set_bit(BH_Lock, &bh->b_state)) {
ASSERT(buffer_mapped(bh)); ASSERT(buffer_mapped(bh));
xfs_add_to_ioend(inode, xfs_add_to_ioend(inode, bh, offset, type,
bh, p_offset, type,
&ioend, !iomap_valid); &ioend, !iomap_valid);
page_dirty--; page_dirty--;
count++; count++;