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

Commit bb450361 authored by Tim Gardner's avatar Tim Gardner Committed by Tyler Hicks
Browse files

ecryptfs: Remove unnecessary variable initialization 



Removes unneeded variable initialization in ecryptfs_read_metadata(). Also adds
a small comment to help explain metadata reading logic.

[tyhicks@canonical.com: Pulled out of for-stable patch and wrote commit msg]
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
parent 30373dc0

fs/ecryptfs/crypto.c

+3 −2
Original line number Diff line number Diff line
@@ -1590,8 +1590,8 @@ int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry, 
 */

int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)

{

	int rc = 0;

	char *page_virt = NULL;

	int rc;

	char *page_virt;

	struct inode *ecryptfs_inode = ecryptfs_dentry->d_inode;

	struct ecryptfs_crypt_stat *crypt_stat =

	    &ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat;
@@ -1616,6 +1616,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry) 
						ecryptfs_dentry,

						ECRYPTFS_VALIDATE_HEADER_SIZE);

	if (rc) {

		/* metadata is not in the file header, so try xattrs */

		memset(page_virt, 0, PAGE_CACHE_SIZE);

		rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_inode);

		if (rc) {