From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 13 Feb 2012 03:06:33 +0000 (-0500)
Subject: fat: switch to d_make_root()
X-Git-Tag: MMI-PSA29.97-13-9~17245^2~53
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1688f86046e5572623b2eacb685eb707fe21fb0a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

fat: switch to d_make_root()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 3ab841054d53..21687e31acc0 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1496,11 +1496,13 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
 	root_inode->i_ino = MSDOS_ROOT_INO;
 	root_inode->i_version = 1;
 	error = fat_read_root(root_inode);
-	if (error < 0)
+	if (error < 0) {
+		iput(root_inode);
 		goto out_fail;
+	}
 	error = -ENOMEM;
 	insert_inode_hash(root_inode);
-	sb->s_root = d_alloc_root(root_inode);
+	sb->s_root = d_make_root(root_inode);
 	if (!sb->s_root) {
 		fat_msg(sb, KERN_ERR, "get root inode failed");
 		goto out_fail;
@@ -1516,8 +1518,6 @@ out_invalid:
 out_fail:
 	if (fat_inode)
 		iput(fat_inode);
-	if (root_inode)
-		iput(root_inode);
 	unload_nls(sbi->nls_io);
 	unload_nls(sbi->nls_disk);
 	if (sbi->options.iocharset != fat_default_iocharset)