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 branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
jffs2
/
nodelist.c
diff --git
a/fs/jffs2/nodelist.c
b/fs/jffs2/nodelist.c
index c79eebb8ab32caeeb0f3527ed54af5e37c8eff89..d4d0c41490cddad3a99c89727dd848a405693520 100644
(file)
--- a/
fs/jffs2/nodelist.c
+++ b/
fs/jffs2/nodelist.c
@@
-134,7
+134,7
@@
static void jffs2_fragtree_insert(struct jffs2_node_frag *newfrag, struct jffs2_
/*
* Allocate and initializes a new fragment.
*/
/*
* Allocate and initializes a new fragment.
*/
-static
inline
struct jffs2_node_frag * new_fragment(struct jffs2_full_dnode *fn, uint32_t ofs, uint32_t size)
+static struct jffs2_node_frag * new_fragment(struct jffs2_full_dnode *fn, uint32_t ofs, uint32_t size)
{
struct jffs2_node_frag *newfrag;
{
struct jffs2_node_frag *newfrag;
@@
-406,7
+406,8
@@
static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
int err = 0, pointed = 0;
struct jffs2_eraseblock *jeb;
unsigned char *buffer;
int err = 0, pointed = 0;
struct jffs2_eraseblock *jeb;
unsigned char *buffer;
- uint32_t crc, ofs, retlen, len;
+ uint32_t crc, ofs, len;
+ size_t retlen;
BUG_ON(tn->csize == 0);
BUG_ON(tn->csize == 0);
@@
-513,7
+514,7
@@
free_out:
*
* Checks the node if we are in the checking stage.
*/
*
* Checks the node if we are in the checking stage.
*/
-static in
line in
t check_node(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_tmp_dnode_info *tn)
+static int check_node(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_tmp_dnode_info *tn)
{
int ret;
{
int ret;