Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30632870 authored by Tyler Hicks's avatar Tyler Hicks
Browse files

eCryptfs: Remove ecryptfs_header_cache_2 



Now that ecryptfs_lookup_interpose() is no longer using
ecryptfs_header_cache_2 to read in metadata, the kmem_cache can be
removed and the ecryptfs_header_cache_1 kmem_cache can be renamed to
ecryptfs_header_cache.

Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 778aeb42

fs/ecryptfs/crypto.c

+3 −4
Original line number Diff line number Diff line
@@ -1234,8 +1234,7 @@ ecryptfs_write_header_metadata(char *virt, 
	(*written) = 6;

}



struct kmem_cache *ecryptfs_header_cache_1;

struct kmem_cache *ecryptfs_header_cache_2;

struct kmem_cache *ecryptfs_header_cache;



/**

 * ecryptfs_write_headers_virt
@@ -1601,7 +1600,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) 
	ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,

						      mount_crypt_stat);

	/* Read the first page from the underlying file */

	page_virt = kmem_cache_alloc(ecryptfs_header_cache_1, GFP_USER);

	page_virt = kmem_cache_alloc(ecryptfs_header_cache, GFP_USER);

	if (!page_virt) {

		rc = -ENOMEM;

		printk(KERN_ERR "%s: Unable to allocate page_virt\n",
@@ -1646,7 +1645,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) 
out:

	if (page_virt) {

		memset(page_virt, 0, PAGE_CACHE_SIZE);

		kmem_cache_free(ecryptfs_header_cache_1, page_virt);

		kmem_cache_free(ecryptfs_header_cache, page_virt);

	}

	return rc;

}

fs/ecryptfs/ecryptfs_kernel.h

+1 −2
Original line number Diff line number Diff line
@@ -605,8 +605,7 @@ extern struct kmem_cache *ecryptfs_file_info_cache; 
extern struct kmem_cache *ecryptfs_dentry_info_cache;

extern struct kmem_cache *ecryptfs_inode_info_cache;

extern struct kmem_cache *ecryptfs_sb_info_cache;

extern struct kmem_cache *ecryptfs_header_cache_1;

extern struct kmem_cache *ecryptfs_header_cache_2;

extern struct kmem_cache *ecryptfs_header_cache;

extern struct kmem_cache *ecryptfs_xattr_cache;

extern struct kmem_cache *ecryptfs_key_record_cache;

extern struct kmem_cache *ecryptfs_key_sig_cache;

fs/ecryptfs/main.c

+2 −7
Original line number Diff line number Diff line
@@ -635,13 +635,8 @@ static struct ecryptfs_cache_info { 
		.size = sizeof(struct ecryptfs_sb_info),

	},

	{

		.cache = &ecryptfs_header_cache_1,

		.name = "ecryptfs_headers_1",

		.size = PAGE_CACHE_SIZE,

	},

	{

		.cache = &ecryptfs_header_cache_2,

		.name = "ecryptfs_headers_2",

		.cache = &ecryptfs_header_cache,

		.name = "ecryptfs_headers",

		.size = PAGE_CACHE_SIZE,

	},

	{