aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/summary.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/jffs2/summary.c')
-rw-r--r--fs/jffs2/summary.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 308251266c6c..fb9cec61fcf2 100644
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -82,7 +82,7 @@ static int jffs2_sum_add_mem(struct jffs2_summary *s, union jffs2_sum_mem *item)
82 je32_to_cpu(item->d.ino)); 82 je32_to_cpu(item->d.ino));
83 break; 83 break;
84 default: 84 default:
85 JFFS2_WARNING("UNKNOWN node type %u\n", 85 JFFS2_WARNING("UNKNOWN node type %u\n",
86 je16_to_cpu(item->u.nodetype)); 86 je16_to_cpu(item->u.nodetype));
87 return 1; 87 return 1;
88 } 88 }
@@ -174,7 +174,7 @@ void jffs2_sum_disable_collecting(struct jffs2_summary *s)
174 s->sum_size = JFFS2_SUMMARY_NOSUM_SIZE; 174 s->sum_size = JFFS2_SUMMARY_NOSUM_SIZE;
175} 175}
176 176
177int jffs2_sum_is_disabled(struct jffs2_summary *s) 177int jffs2_sum_is_disabled(struct jffs2_summary *s)
178{ 178{
179 return (s->sum_size == JFFS2_SUMMARY_NOSUM_SIZE); 179 return (s->sum_size == JFFS2_SUMMARY_NOSUM_SIZE);
180} 180}
@@ -609,7 +609,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock
609 sdrnt_ptr->nsize = c->summary->sum_list_head->d.nsize; 609 sdrnt_ptr->nsize = c->summary->sum_list_head->d.nsize;
610 sdrnt_ptr->type = c->summary->sum_list_head->d.type; 610 sdrnt_ptr->type = c->summary->sum_list_head->d.type;
611 611
612 memcpy(sdrnt_ptr->name, c->summary->sum_list_head->d.name, 612 memcpy(sdrnt_ptr->name, c->summary->sum_list_head->d.name,
613 c->summary->sum_list_head->d.nsize); 613 c->summary->sum_list_head->d.nsize);
614 614
615 wpage += JFFS2_SUMMARY_DIRENT_SIZE(c->summary->sum_list_head->d.nsize); 615 wpage += JFFS2_SUMMARY_DIRENT_SIZE(c->summary->sum_list_head->d.nsize);
@@ -687,7 +687,7 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)
687 datasize = c->summary->sum_size + sizeof(struct jffs2_sum_marker); 687 datasize = c->summary->sum_size + sizeof(struct jffs2_sum_marker);
688 infosize = sizeof(struct jffs2_raw_summary) + datasize; 688 infosize = sizeof(struct jffs2_raw_summary) + datasize;
689 padsize = jeb->free_size - infosize; 689 padsize = jeb->free_size - infosize;
690 infosize += padsize; 690 infosize += padsize;
691 datasize += padsize; 691 datasize += padsize;
692 692
693 /* Is there enough space for summary? */ 693 /* Is there enough space for summary? */