aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/fs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 2e0123867cb1..c0d5c9d770da 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -561,9 +561,9 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
561 ret = -ENOMEM; 561 ret = -ENOMEM;
562 562
563 D1(printk(KERN_DEBUG "jffs2_do_fill_super(): d_alloc_root()\n")); 563 D1(printk(KERN_DEBUG "jffs2_do_fill_super(): d_alloc_root()\n"));
564 sb->s_root = d_alloc_root(root_i); 564 sb->s_root = d_make_root(root_i);
565 if (!sb->s_root) 565 if (!sb->s_root)
566 goto out_root_i; 566 goto out_root;
567 567
568 sb->s_maxbytes = 0xFFFFFFFF; 568 sb->s_maxbytes = 0xFFFFFFFF;
569 sb->s_blocksize = PAGE_CACHE_SIZE; 569 sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -573,8 +573,6 @@ int jffs2_do_fill_super(struct super_block *sb, void *data, int silent)
573 jffs2_start_garbage_collect_thread(c); 573 jffs2_start_garbage_collect_thread(c);
574 return 0; 574 return 0;
575 575
576 out_root_i:
577 iput(root_i);
578out_root: 576out_root:
579 jffs2_free_ino_caches(c); 577 jffs2_free_ino_caches(c);
580 jffs2_free_raw_node_refs(c); 578 jffs2_free_raw_node_refs(c);