diff options
author | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2010-02-11 06:09:14 -0500 |
---|---|---|
committer | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2010-03-23 13:30:41 -0400 |
commit | fa3ef1cb4e6e9958a9bfaa977c107c515907f102 (patch) | |
tree | f297192533a0c8720534c76c6429e68ae92b94d9 /fs/ecryptfs/mmap.c | |
parent | 157f1071354db1aed885816094888e0e257c9d0a (diff) |
eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front
This patch renames the num_header_bytes_at_front variable to
metadata_size since it now contains the max size of the metadata.
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs/mmap.c')
-rw-r--r-- | fs/ecryptfs/mmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index 5a30e01547f1..270f42ae7c0d 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c | |||
@@ -122,8 +122,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, | |||
122 | * num_extents_per_page) | 122 | * num_extents_per_page) |
123 | + extent_num_in_page); | 123 | + extent_num_in_page); |
124 | size_t num_header_extents_at_front = | 124 | size_t num_header_extents_at_front = |
125 | (crypt_stat->num_header_bytes_at_front | 125 | (crypt_stat->metadata_size / crypt_stat->extent_size); |
126 | / crypt_stat->extent_size); | ||
127 | 126 | ||
128 | if (view_extent_num < num_header_extents_at_front) { | 127 | if (view_extent_num < num_header_extents_at_front) { |
129 | /* This is a header extent */ | 128 | /* This is a header extent */ |
@@ -152,7 +151,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, | |||
152 | /* This is an encrypted data extent */ | 151 | /* This is an encrypted data extent */ |
153 | loff_t lower_offset = | 152 | loff_t lower_offset = |
154 | ((view_extent_num * crypt_stat->extent_size) | 153 | ((view_extent_num * crypt_stat->extent_size) |
155 | - crypt_stat->num_header_bytes_at_front); | 154 | - crypt_stat->metadata_size); |
156 | 155 | ||
157 | rc = ecryptfs_read_lower_page_segment( | 156 | rc = ecryptfs_read_lower_page_segment( |
158 | page, (lower_offset >> PAGE_CACHE_SHIFT), | 157 | page, (lower_offset >> PAGE_CACHE_SHIFT), |