aboutsummaryrefslogtreecommitdiffstats
path: root/fs/buffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/buffer.c')
-rw-r--r--fs/buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 263df0f192aa..55f0975a9b15 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1762,7 +1762,7 @@ static int __block_write_full_page(struct inode *inode, struct page *page,
1762 * handle that here by just cleaning them. 1762 * handle that here by just cleaning them.
1763 */ 1763 */
1764 1764
1765 block = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits); 1765 block = (sector_t)page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
1766 head = page_buffers(page); 1766 head = page_buffers(page);
1767 bh = head; 1767 bh = head;
1768 1768
@@ -2635,7 +2635,7 @@ int block_truncate_page(struct address_space *mapping,
2635 pgoff_t index = from >> PAGE_CACHE_SHIFT; 2635 pgoff_t index = from >> PAGE_CACHE_SHIFT;
2636 unsigned offset = from & (PAGE_CACHE_SIZE-1); 2636 unsigned offset = from & (PAGE_CACHE_SIZE-1);
2637 unsigned blocksize; 2637 unsigned blocksize;
2638 pgoff_t iblock; 2638 sector_t iblock;
2639 unsigned length, pos; 2639 unsigned length, pos;
2640 struct inode *inode = mapping->host; 2640 struct inode *inode = mapping->host;
2641 struct page *page; 2641 struct page *page;
@@ -2651,7 +2651,7 @@ int block_truncate_page(struct address_space *mapping,
2651 return 0; 2651 return 0;
2652 2652
2653 length = blocksize - length; 2653 length = blocksize - length;
2654 iblock = index << (PAGE_CACHE_SHIFT - inode->i_blkbits); 2654 iblock = (sector_t)index << (PAGE_CACHE_SHIFT - inode->i_blkbits);
2655 2655
2656 page = grab_cache_page(mapping, index); 2656 page = grab_cache_page(mapping, index);
2657 err = -ENOMEM; 2657 err = -ENOMEM;