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 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ubifs
/
sb.c
diff --git
a/fs/ubifs/sb.c
b/fs/ubifs/sb.c
index 4c37607a958e037f7242b2f01ef9d69dd836512b..79c6dbbc0e04ddacc39aaa57e726314971c4e65b 100644
(file)
--- a/
fs/ubifs/sb.c
+++ b/
fs/ubifs/sb.c
@@
-332,6
+332,8
@@
static int create_default_filesystem(struct ubifs_info *c)
cs->ch.node_type = UBIFS_CS_NODE;
err = ubifs_write_node(c, cs, UBIFS_CS_NODE_SZ, UBIFS_LOG_LNUM, 0);
kfree(cs);
cs->ch.node_type = UBIFS_CS_NODE;
err = ubifs_write_node(c, cs, UBIFS_CS_NODE_SZ, UBIFS_LOG_LNUM, 0);
kfree(cs);
+ if (err)
+ return err;
ubifs_msg("default file-system created");
return 0;
ubifs_msg("default file-system created");
return 0;
@@
-447,7
+449,7
@@
static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
goto failed;
}
goto failed;
}
- if (c->default_compr
< 0 || c->default_compr
>= UBIFS_COMPR_TYPES_CNT) {
+ if (c->default_compr >= UBIFS_COMPR_TYPES_CNT) {
err = 13;
goto failed;
}
err = 13;
goto failed;
}