projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-3.4-rc1' of git://git.infradead.org/linux-ubi
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ubifs
/
super.c
diff --git
a/fs/ubifs/super.c
b/fs/ubifs/super.c
index 63765d58445b61e7b871e7e1722fedd1668a23b9..76e4e0566ad6c260069a87f56c253f7e9a17727b 100644
(file)
--- a/
fs/ubifs/super.c
+++ b/
fs/ubifs/super.c
@@
-2076,15
+2076,13
@@
static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
goto out_umount;
}
- sb->s_root = d_
alloc
_root(root);
+ sb->s_root = d_
make
_root(root);
if (!sb->s_root)
- goto out_
ipu
t;
+ goto out_
umoun
t;
mutex_unlock(&c->umount_mutex);
return 0;
-out_iput:
- iput(root);
out_umount:
ubifs_umount(c);
out_unlock: