VisionFive2 Linux kernel

author: Al Viro <viro@zeniv.linux.org.uk> 2012-01-08 22:15:13 -0500 committer: Al Viro <viro@zeniv.linux.org.uk> 2012-03-20 21:29:35 -0400 commit: 48fde701aff662559b38d9a609574068f22d00fe parent: 6b4231e2f92adbcf96fb2a3fa751d7ca0a61b21f

Commit Summary:

switch open-coded instances of d_make_root() to new helper

Diffstat:

1 file changed, 2 insertions, 4 deletions

diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 6b009548d2e0..db18d866d981 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -260,15 +260,13 @@ static int qnx4_fill_super(struct super_block *s, void *data, int silent)
  	}
 
 	ret = -ENOMEM;
- 	s->s_root = d_alloc_root(root);
+ 	s->s_root = d_make_root(root);
  	if (s->s_root == NULL)
- 		goto outi;
+ 		goto outb;
 
 	brelse(bh);
 	return 0;
 
-      outi:
-	iput(root);
       outb:
 	kfree(qs->BitMap);
       out: