From 8ab78ea070fa5b7e8c41aaa155dde55186eae2c1 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 17:19:38 -0800
Subject: [PATCH] --- yaml --- r: 230639 b: refs/heads/master c:
 6254b32b5791e47ba1c679d023f26985fa34755a h: refs/heads/master i:   230637:
 49019cbce3b7e04454c59cd5cc37a4bc8bfc14b0   230635:
 0123efb651198638b51582039015443e68f52883   230631:
 b45c7e092e2cf777e1e8fc9381f318d41b99fc57   230623:
 90a2d57c384310309a9268216f6fa82143bf8522 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/ecryptfs/main.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7371fef03cb5..8d36cb527d51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a86cb7c2b1e9eb98b36d0a3cf4444d8851968b1
+refs/heads/master: 6254b32b5791e47ba1c679d023f26985fa34755a
diff --git a/trunk/fs/ecryptfs/main.c b/trunk/fs/ecryptfs/main.c
index 9ed476906327..d3b28abdd6aa 100644
--- a/trunk/fs/ecryptfs/main.c
+++ b/trunk/fs/ecryptfs/main.c
@@ -141,13 +141,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry)
 	return rc;
 }
 
-static inode *ecryptfs_get_inode(struct inode *lower_inode,
+static struct inode *ecryptfs_get_inode(struct inode *lower_inode,
 		       struct super_block *sb)
 {
 	struct inode *inode;
 	int rc = 0;
 
-	lower_inode = lower_dentry->d_inode;
 	if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb)) {
 		rc = -EXDEV;
 		goto out;
@@ -202,7 +201,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry,
 {
 	struct inode *lower_inode = lower_dentry->d_inode;
 	struct inode *inode = ecryptfs_get_inode(lower_inode, sb);
-	if (IS_ERR(inode)
+	if (IS_ERR(inode))
 		return PTR_ERR(inode);
 	if (flags & ECRYPTFS_INTERPOSE_FLAG_D_ADD)
 		d_add(dentry, inode);