From 5dda6992a3138f3839dcaecbcd2fbea4dd514c7c Mon Sep 17 00:00:00 2001 From: Michael Halcrow Date: Tue, 16 Oct 2007 01:28:06 -0700 Subject: eCryptfs: remove assignments in if-statements Remove assignments in if-statements. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/ecryptfs/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'fs/ecryptfs/file.c') 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; } -- cgit v1.2.1