X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fautofs4%2Finode.c;h=d8dc002e9cc39d4b15511a6cc6df4d6b8b39897f;hb=7e61b3ff50f59f134054aaf43096c761fafecf0c;hp=06858d955120ed43fab44309f1bc978f11c24124;hpb=fe83558a33f509277aa07566d484096cc7149807;p=~andy%2Flinux

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 06858d95512..d8dc002e9cc 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -247,12 +247,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
 	if (!ino)
 		goto fail_free;
 	root_inode = autofs4_get_inode(s, S_IFDIR | 0755);
-	if (!root_inode)
-		goto fail_ino;
-
-	root = d_alloc_root(root_inode);
+	root = d_make_root(root_inode);
 	if (!root)
-		goto fail_iput;
+		goto fail_ino;
 	pipe = NULL;
 
 	root->d_fsdata = ino;
@@ -317,9 +314,6 @@ fail_fput:
 fail_dput:
 	dput(root);
 	goto fail_free;
-fail_iput:
-	printk("autofs: get root dentry failed\n");
-	iput(root_inode);
 fail_ino:
 	kfree(ino);
 fail_free: