eCryptfs: fix data types

[linux-2.6-omap-h63xx.git] / fs / ecryptfs / mmap.c

diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 9bc707df3b60a2dab53bc9da0d4c85bd41ddc917..6ae0afb238d12c33aebdfaccc34b64fea0582ff8 100644 (file)
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -286,7 +286,8 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,
        int rc = 0;
 
        while (extent_num_in_page < num_extents_per_page) {
-               loff_t view_extent_num = ((page->index * num_extents_per_page)
+               loff_t view_extent_num = ((((loff_t)page->index)
+                                          * num_extents_per_page)
                                          + extent_num_in_page);
 
                if (view_extent_num < crypt_stat->num_header_extents_at_front) {
@@ -706,7 +707,7 @@ static int ecryptfs_commit_write(struct file *file, struct page *page,
                                "index [0x%.16x])\n", page->index);
                goto out;
        }
-       pos = (page->index << PAGE_CACHE_SHIFT) + to;
+       pos = (((loff_t)page->index) << PAGE_CACHE_SHIFT) + to;
        if (pos > i_size_read(ecryptfs_inode)) {
                i_size_write(ecryptfs_inode, pos);
                ecryptfs_printk(KERN_DEBUG, "Expanded file size to "