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

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

eCryptfs: Fix -Wunused-but-set-variable warnings 



These two variables are no longer used and can be removed. Fixes
warnings when building with W=1.

Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
parent fa519964

fs/ecryptfs/dentry.c

+0 −2
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ 
static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags)

{

	struct dentry *lower_dentry;

	struct vfsmount *lower_mnt;

	int rc = 1;



	if (flags & LOOKUP_RCU)

		return -ECHILD;



	lower_dentry = ecryptfs_dentry_to_lower(dentry);

	lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);

	if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate)

		goto out;

	rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags);

fs/ecryptfs/file.c

+0 −2
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
	struct dentry *ecryptfs_dentry = file->f_path.dentry;

	/* Private value of ecryptfs_dentry allocated in

	 * ecryptfs_lookup() */

	struct dentry *lower_dentry;

	struct ecryptfs_file_info *file_info;



	mount_crypt_stat = &ecryptfs_superblock_to_private(
@@ -222,7 +221,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file) 
		rc = -ENOMEM;

		goto out;

	}

	lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry);

	crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;

	mutex_lock(&crypt_stat->cs_mutex);

	if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)) {