diff options
author | Tyler Hicks <tyhicks@canonical.com> | 2013-01-17 14:36:10 -0500 |
---|---|---|
committer | Tyler Hicks <tyhicks@canonical.com> | 2013-01-17 14:36:10 -0500 |
commit | bbcb03e3ce8c76a4ecf0ea7d365f9f0e913fc329 (patch) | |
tree | a0a97379983c43130993bfa3f73f12c20814c246 /fs | |
parent | fa5199648e273a5e3e80aca41c1eb53700438dc1 (diff) |
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: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ecryptfs/dentry.c | 2 | ||||
-rw-r--r-- | fs/ecryptfs/file.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/ecryptfs/dentry.c b/fs/ecryptfs/dentry.c index 1b5d9af937df..bf12ba5dd223 100644 --- a/fs/ecryptfs/dentry.c +++ b/fs/ecryptfs/dentry.c | |||
@@ -45,14 +45,12 @@ | |||
45 | static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags) | 45 | static int ecryptfs_d_revalidate(struct dentry *dentry, unsigned int flags) |
46 | { | 46 | { |
47 | struct dentry *lower_dentry; | 47 | struct dentry *lower_dentry; |
48 | struct vfsmount *lower_mnt; | ||
49 | int rc = 1; | 48 | int rc = 1; |
50 | 49 | ||
51 | if (flags & LOOKUP_RCU) | 50 | if (flags & LOOKUP_RCU) |
52 | return -ECHILD; | 51 | return -ECHILD; |
53 | 52 | ||
54 | lower_dentry = ecryptfs_dentry_to_lower(dentry); | 53 | lower_dentry = ecryptfs_dentry_to_lower(dentry); |
55 | lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry); | ||
56 | if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate) | 54 | if (!lower_dentry->d_op || !lower_dentry->d_op->d_revalidate) |
57 | goto out; | 55 | goto out; |
58 | rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags); | 56 | rc = lower_dentry->d_op->d_revalidate(lower_dentry, flags); |
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index d45ba4568128..bfa52d2ef460 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c | |||
@@ -199,7 +199,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file) | |||
199 | struct dentry *ecryptfs_dentry = file->f_path.dentry; | 199 | struct dentry *ecryptfs_dentry = file->f_path.dentry; |
200 | /* Private value of ecryptfs_dentry allocated in | 200 | /* Private value of ecryptfs_dentry allocated in |
201 | * ecryptfs_lookup() */ | 201 | * ecryptfs_lookup() */ |
202 | struct dentry *lower_dentry; | ||
203 | struct ecryptfs_file_info *file_info; | 202 | struct ecryptfs_file_info *file_info; |
204 | 203 | ||
205 | mount_crypt_stat = &ecryptfs_superblock_to_private( | 204 | mount_crypt_stat = &ecryptfs_superblock_to_private( |
@@ -222,7 +221,6 @@ static int ecryptfs_open(struct inode *inode, struct file *file) | |||
222 | rc = -ENOMEM; | 221 | rc = -ENOMEM; |
223 | goto out; | 222 | goto out; |
224 | } | 223 | } |
225 | lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry); | ||
226 | crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat; | 224 | crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat; |
227 | mutex_lock(&crypt_stat->cs_mutex); | 225 | mutex_lock(&crypt_stat->cs_mutex); |
228 | if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)) { | 226 | if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)) { |