summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/mmap.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-10-16 10:28:05 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 18:43:12 +0200
commit45eaab79678b9e27e08f0cf250eb2df9d6a48df0 (patch)
treeff13018aa1d66f1b1d9abbba6df7a361518bacb7 /fs/ecryptfs/mmap.c
parenteCryptfs: Use generic_file_splice_read() (diff)
downloadlinux-45eaab79678b9e27e08f0cf250eb2df9d6a48df0.tar.xz
linux-45eaab79678b9e27e08f0cf250eb2df9d6a48df0.zip
eCryptfs: remove header_extent_size
There is no point to keeping a separate header_extent_size and an extent_size. The total size of the header can always be represented as some multiple of the regular data extent size. [randy.dunlap@oracle.com: ecryptfs: fix printk format warning] Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/mmap.c')
-rw-r--r--fs/ecryptfs/mmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index aaea55a61ea1..89dbbbbcce07 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -301,7 +301,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page)
} else if (crypt_stat->flags & ECRYPTFS_VIEW_AS_ENCRYPTED) {
if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) {
int num_pages_in_header_region =
- (crypt_stat->header_extent_size
+ (crypt_stat->extent_size
/ PAGE_CACHE_SIZE);
if (page->index < num_pages_in_header_region) {