tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Tyler Hicks fa3ef1cb 157f1071

+15 -20
unified split
+10 -14
fs/ecryptfs/crypto.c
··· 834 834 set_extent_mask_and_shift(crypt_stat); 835 835 crypt_stat->iv_bytes = ECRYPTFS_DEFAULT_IV_BYTES; 836 836 if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) 837 - crypt_stat->num_header_bytes_at_front = 838 - ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; 837 + crypt_stat->metadata_size = ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; 839 838 else { 840 839 if (PAGE_CACHE_SIZE <= ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE) 841 - crypt_stat->num_header_bytes_at_front = 840 + crypt_stat->metadata_size = 842 841 ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; 843 842 else 844 - crypt_stat->num_header_bytes_at_front = PAGE_CACHE_SIZE; 843 + crypt_stat->metadata_size = PAGE_CACHE_SIZE; 845 844 } 846 845 } 847 846 ··· 1237 1238 1238 1239 header_extent_size = (u32)crypt_stat->extent_size; 1239 1240 num_header_extents_at_front = 1240 - (u16)(crypt_stat->num_header_bytes_at_front 1241 - / crypt_stat->extent_size); 1241 + (u16)(crypt_stat->metadata_size / crypt_stat->extent_size); 1242 1242 put_unaligned_be32(header_extent_size, virt); 1243 1243 virt += 4; 1244 1244 put_unaligned_be16(num_header_extents_at_front, virt); ··· 1380 1382 rc = -EINVAL; 1381 1383 goto out; 1382 1384 } 1383 - virt_len = crypt_stat->num_header_bytes_at_front; 1385 + virt_len = crypt_stat->metadata_size; 1384 1386 order = get_order(virt_len); 1385 1387 /* Released in this function */ 1386 1388 virt = (char *)ecryptfs_get_zeroed_pages(GFP_KERNEL, order); ··· 1426 1428 header_extent_size = get_unaligned_be32(virt); 1427 1429 virt += sizeof(__be32); 1428 1430 num_header_extents_at_front = get_unaligned_be16(virt); 1429 - crypt_stat->num_header_bytes_at_front = 1430 - (((size_t)num_header_extents_at_front 1431 - * (size_t)header_extent_size)); 1431 + crypt_stat->metadata_size = (((size_t)num_header_extents_at_front 1432 + * (size_t)header_extent_size)); 1432 1433 (*bytes_read) = (sizeof(__be32) + sizeof(__be16)); 1433 1434 if ((validate_header_size == ECRYPTFS_VALIDATE_HEADER_SIZE) 1434 - && (crypt_stat->num_header_bytes_at_front 1435 + && (crypt_stat->metadata_size 1435 1436 < ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE)) { 1436 1437 rc = -EINVAL; 1437 1438 printk(KERN_WARNING "Invalid header size: [%zd]\n", 1438 - crypt_stat->num_header_bytes_at_front); 1439 + crypt_stat->metadata_size); 1439 1440 } 1440 1441 return rc; 1441 1442 } ··· 1449 1452 */ 1450 1453 static void set_default_header_data(struct ecryptfs_crypt_stat *crypt_stat) 1451 1454 { 1452 - crypt_stat->num_header_bytes_at_front = 1453 - ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; 1455 + crypt_stat->metadata_size = ECRYPTFS_MINIMUM_HEADER_EXTENT_SIZE; 1454 1456 } 1455 1457 1456 1458 /**
+2 -2
fs/ecryptfs/ecryptfs_kernel.h
··· 273 273 u32 flags; 274 274 unsigned int file_version; 275 275 size_t iv_bytes; 276 - size_t num_header_bytes_at_front; 276 + size_t metadata_size; 277 277 size_t extent_size; /* Data extent size; default is 4096 */ 278 278 size_t key_size; 279 279 size_t extent_shift; ··· 469 469 { 470 470 if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) 471 471 return 0; 472 - return crypt_stat->num_header_bytes_at_front; 472 + return crypt_stat->metadata_size; 473 473 } 474 474 475 475 static inline struct ecryptfs_file_info *
+1 -1
fs/ecryptfs/inode.c
··· 335 335 ecryptfs_dentry->d_sb)->mount_crypt_stat; 336 336 if (mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED) { 337 337 if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) 338 - file_size = (crypt_stat->num_header_bytes_at_front 338 + file_size = (crypt_stat->metadata_size 339 339 + i_size_read(lower_dentry->d_inode)); 340 340 else 341 341 file_size = i_size_read(lower_dentry->d_inode);
+2 -3
fs/ecryptfs/mmap.c
··· 122 122 * num_extents_per_page) 123 123 + extent_num_in_page); 124 124 size_t num_header_extents_at_front = 125 - (crypt_stat->num_header_bytes_at_front 126 - / crypt_stat->extent_size); 125 + (crypt_stat->metadata_size / crypt_stat->extent_size); 127 126 128 127 if (view_extent_num < num_header_extents_at_front) { 129 128 /* This is a header extent */ ··· 151 152 /* This is an encrypted data extent */ 152 153 loff_t lower_offset = 153 154 ((view_extent_num * crypt_stat->extent_size) 154 - - crypt_stat->num_header_bytes_at_front); 155 + - crypt_stat->metadata_size); 155 156 156 157 rc = ecryptfs_read_lower_page_segment( 157 158 page, (lower_offset >> PAGE_CACHE_SHIFT),