summaryrefslogtreecommitdiff
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-11-14 16:58:27 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-14 18:45:36 -0800
commit8a146a2b0d6e97941a5c2dc5d8a3ea1e6c3ab997 (patch)
treec9bc95bcb68243ea7068307570b9dcec0d620cff /fs/ecryptfs
parent0fd4980fa75acc78c747b1f43d1204f6572a4845 (diff)
downloadlinux-3.10-8a146a2b0d6e97941a5c2dc5d8a3ea1e6c3ab997.tar.gz
linux-3.10-8a146a2b0d6e97941a5c2dc5d8a3ea1e6c3ab997.tar.bz2
linux-3.10-8a146a2b0d6e97941a5c2dc5d8a3ea1e6c3ab997.zip
eCryptfs: cast page->index to loff_t instead of off_t
page->index should be cast to loff_t instead of off_t. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Reported-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/read_write.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index 2150edf9a58..6b7474a4336 100644
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -87,7 +87,7 @@ int ecryptfs_write_lower_page_segment(struct inode *ecryptfs_inode,
loff_t offset;
int rc;
- offset = ((((off_t)page_for_lower->index) << PAGE_CACHE_SHIFT)
+ offset = ((((loff_t)page_for_lower->index) << PAGE_CACHE_SHIFT)
+ offset_in_page);
virt = kmap(page_for_lower);
rc = ecryptfs_write_lower(ecryptfs_inode, virt, offset, size);