diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2007-10-16 04:28:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:12 -0400 |
commit | 5dda6992a3138f3839dcaecbcd2fbea4dd514c7c (patch) | |
tree | c9ca012364edc18a2baed74721052b7da9d39f53 /fs/ecryptfs/file.c | |
parent | 45eaab79678b9e27e08f0cf250eb2df9d6a48df0 (diff) |
eCryptfs: remove assignments in if-statements
Remove assignments in if-statements.
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/file.c')
-rw-r--r-- | fs/ecryptfs/file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 12ba7e3a69f9..59c846d29a8e 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c | |||
@@ -230,8 +230,9 @@ static int ecryptfs_open(struct inode *inode, struct file *file) | |||
230 | lower_flags &= ~O_APPEND; | 230 | lower_flags &= ~O_APPEND; |
231 | lower_mnt = ecryptfs_dentry_to_lower_mnt(ecryptfs_dentry); | 231 | lower_mnt = ecryptfs_dentry_to_lower_mnt(ecryptfs_dentry); |
232 | /* Corresponding fput() in ecryptfs_release() */ | 232 | /* Corresponding fput() in ecryptfs_release() */ |
233 | if ((rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt, | 233 | rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt, |
234 | lower_flags))) { | 234 | lower_flags); |
235 | if (rc) { | ||
235 | ecryptfs_printk(KERN_ERR, "Error opening lower file\n"); | 236 | ecryptfs_printk(KERN_ERR, "Error opening lower file\n"); |
236 | goto out_puts; | 237 | goto out_puts; |
237 | } | 238 | } |
@@ -300,7 +301,8 @@ static int ecryptfs_release(struct inode *inode, struct file *file) | |||
300 | struct inode *lower_inode = ecryptfs_inode_to_lower(inode); | 301 | struct inode *lower_inode = ecryptfs_inode_to_lower(inode); |
301 | int rc; | 302 | int rc; |
302 | 303 | ||
303 | if ((rc = ecryptfs_close_lower_file(lower_file))) { | 304 | rc = ecryptfs_close_lower_file(lower_file); |
305 | if (rc) { | ||
304 | printk(KERN_ERR "Error closing lower_file\n"); | 306 | printk(KERN_ERR "Error closing lower_file\n"); |
305 | goto out; | 307 | goto out; |
306 | } | 308 | } |