From: Michael Halcrow <mhalcrow@us.ibm.com>

This fixes the error path for when eCryptfs has trouble mounting.

Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/ecryptfs/main.c |   40 ++++++++++++++--------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff -puN fs/ecryptfs/main.c~ecryptfs-graceful-handling-of-mount-error fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c~ecryptfs-graceful-handling-of-mount-error
+++ a/fs/ecryptfs/main.c
@@ -369,18 +369,6 @@ out:
 struct kmem_cache *ecryptfs_sb_info_cache;
 
 /**
- * ecryptfs_cleanup_read_super
- * @sb: The ecryptfs super block
- *
- * Preform the cleanup for ecryptfs_read_super()
- */
-static void ecryptfs_cleanup_read_super(struct super_block *sb)
-{
-	up_write(&sb->s_umount);
-	deactivate_super(sb);
-}
-
-/**
  * ecryptfs_fill_super
  * @sb: The ecryptfs super block
  * @raw_data: The options passed to mount
@@ -433,7 +421,7 @@ ecryptfs_fill_super(struct super_block *
 	       sizeof(struct ecryptfs_dentry_info));
 	rc = 0;
 out:
-	/* Should be able to rely on deactive_super called from
+	/* Should be able to rely on deactivate_super called from
 	 * get_sb_nodev */
 	return rc;
 }
@@ -476,7 +464,6 @@ static int ecryptfs_read_super(struct su
 	goto out;
 out_free:
 	path_release(&nd);
-	ecryptfs_cleanup_read_super(sb);
 out:
 	return rc;
 }
@@ -502,30 +489,31 @@ static int ecryptfs_get_sb(struct file_s
 			struct vfsmount *mnt)
 {
 	int rc;
-	int ret;
 	struct super_block *sb;
 
-	ret = get_sb_nodev(fs_type, flags, raw_data, ecryptfs_fill_super, mnt);
-	if (ret < 0) {
-		ecryptfs_printk(KERN_ERR, "Getting sb failed: %d\n", ret);
+	rc = get_sb_nodev(fs_type, flags, raw_data, ecryptfs_fill_super, mnt);
+	if (rc < 0) {
+		printk(KERN_ERR "Getting sb failed; rc = [%d]\n", rc);
 		goto out;
 	}
 	sb = mnt->mnt_sb;
 	rc = ecryptfs_parse_options(sb, raw_data);
 	if (rc) {
-		deactivate_super(sb);
-		ret = rc;
-		goto out;
+		printk(KERN_ERR "Error parsing options; rc = [%d]\n", rc);
+		goto out_abort;
 	}
 	rc = ecryptfs_read_super(sb, dev_name);
 	if (rc) {
-		up_write(&sb->s_umount);
-		deactivate_super(sb);
-		ret = rc;
-		ecryptfs_printk(KERN_ERR, "Reading sb failed: %d\n", ret);
+		printk(KERN_ERR "Reading sb failed; rc = [%d]\n", rc);
+		goto out_abort;
 	}
+	goto out;
+out_abort:
+	dput(sb->s_root);
+	up_write(&sb->s_umount);
+	deactivate_super(sb);
 out:
-	return ret;
+	return rc;
 }
 
 /**
_