diff options
author | Michael Halcrow <mhalcrow@us.ibm.com> | 2007-10-16 01:28:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:12 -0700 |
commit | 5dda6992a3138f3839dcaecbcd2fbea4dd514c7c (patch) | |
tree | c9ca012364edc18a2baed74721052b7da9d39f53 /fs/ecryptfs/file.c | |
parent | 45eaab79678b9e27e08f0cf250eb2df9d6a48df0 (diff) | |
download | talos-obmc-linux-5dda6992a3138f3839dcaecbcd2fbea4dd514c7c.tar.gz talos-obmc-linux-5dda6992a3138f3839dcaecbcd2fbea4dd514c7c.zip |
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) lower_flags &= ~O_APPEND; lower_mnt = ecryptfs_dentry_to_lower_mnt(ecryptfs_dentry); /* Corresponding fput() in ecryptfs_release() */ - if ((rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt, - lower_flags))) { + rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt, + lower_flags); + if (rc) { ecryptfs_printk(KERN_ERR, "Error opening lower file\n"); goto out_puts; } @@ -300,7 +301,8 @@ static int ecryptfs_release(struct inode *inode, struct file *file) struct inode *lower_inode = ecryptfs_inode_to_lower(inode); int rc; - if ((rc = ecryptfs_close_lower_file(lower_file))) { + rc = ecryptfs_close_lower_file(lower_file); + if (rc) { printk(KERN_ERR "Error closing lower_file\n"); goto out; } |