diff options
Diffstat (limited to 'fs/jffs')
-rw-r--r-- | fs/jffs/inode-v23.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs/inode-v23.c b/fs/jffs/inode-v23.c index 3dcc6d2162cb..2559ee10beda 100644 --- a/fs/jffs/inode-v23.c +++ b/fs/jffs/inode-v23.c | |||
@@ -757,7 +757,7 @@ jffs_do_readpage_nolock(struct file *file, struct page *page) | |||
757 | 757 | ||
758 | read_len = 0; | 758 | read_len = 0; |
759 | result = 0; | 759 | result = 0; |
760 | offset = page->index << PAGE_CACHE_SHIFT; | 760 | offset = page_offset(page); |
761 | 761 | ||
762 | kmap(page); | 762 | kmap(page); |
763 | buf = page_address(page); | 763 | buf = page_address(page); |
@@ -1545,7 +1545,7 @@ jffs_commit_write(struct file *filp, struct page *page, | |||
1545 | { | 1545 | { |
1546 | void *addr = page_address(page) + from; | 1546 | void *addr = page_address(page) + from; |
1547 | /* XXX: PAGE_CACHE_SHIFT or PAGE_SHIFT */ | 1547 | /* XXX: PAGE_CACHE_SHIFT or PAGE_SHIFT */ |
1548 | loff_t pos = (page->index<<PAGE_CACHE_SHIFT) + from; | 1548 | loff_t pos = page_offset(page) + from; |
1549 | 1549 | ||
1550 | return jffs_file_write(filp, addr, to-from, &pos); | 1550 | return jffs_file_write(filp, addr, to-from, &pos); |
1551 | } /* jffs_commit_write() */ | 1551 | } /* jffs_commit_write() */ |