Merge branch 'upstream-fixes'

[linux-2.6] / fs / jffs2 / summary.c

diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c
index 1ebc81e4477de7a5b111b4f73fdad5fdea40e8db..fb9cec61fcf2ebbe050d58669551ca311b6c7e70 100644 (file)
--- a/fs/jffs2/summary.c
+++ b/fs/jffs2/summary.c
@@ -8,7 +8,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: summary.c,v 1.3 2005/09/21 14:43:07 dedekind Exp $
+ * $Id: summary.c,v 1.4 2005/09/26 11:37:21 havasi Exp $
  *
  */
 
@@ -82,7 +82,7 @@ static int jffs2_sum_add_mem(struct jffs2_summary *s, union jffs2_sum_mem *item)
                                                je32_to_cpu(item->d.ino));
                        break;
                default:
-                       JFFS2_WARNING("UNKNOWN node type %u\n", 
+                       JFFS2_WARNING("UNKNOWN node type %u\n",
                                            je16_to_cpu(item->u.nodetype));
                        return 1;
        }
@@ -174,7 +174,7 @@ void jffs2_sum_disable_collecting(struct jffs2_summary *s)
        s->sum_size = JFFS2_SUMMARY_NOSUM_SIZE;
 }
 
-int jffs2_sum_is_disabled(struct jffs2_summary *s) 
+int jffs2_sum_is_disabled(struct jffs2_summary *s)
 {
        return (s->sum_size == JFFS2_SUMMARY_NOSUM_SIZE);
 }
@@ -292,7 +292,7 @@ no_mem:
 /* Process the stored summary information - helper function for jffs2_sum_scan_sumnode() */
 
 static int jffs2_sum_process_sum_data(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,
-                               struct jffs2_summary_node *summary, uint32_t *pseudo_random)
+                               struct jffs2_raw_summary *summary, uint32_t *pseudo_random)
 {
        struct jffs2_raw_node_ref *raw;
        struct jffs2_inode_cache *ic;
@@ -428,7 +428,7 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
 {
        struct jffs2_unknown_node crcnode;
        struct jffs2_raw_node_ref *cache_ref;
-       struct jffs2_summary_node *summary;
+       struct jffs2_raw_summary *summary;
        int ret, sumsize;
        uint32_t crc;
 
@@ -468,14 +468,14 @@ int jffs2_sum_scan_sumnode(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb
                goto crc_err;
        }
 
-       crc = crc32(0, summary, sizeof(struct jffs2_summary_node)-8);
+       crc = crc32(0, summary, sizeof(struct jffs2_raw_summary)-8);
 
        if (je32_to_cpu(summary->node_crc) != crc) {
                dbg_summary("Summary node is corrupt (bad CRC)\n");
                goto crc_err;
        }
 
-       crc = crc32(0, summary->sum, sumsize - sizeof(struct jffs2_summary_node));
+       crc = crc32(0, summary->sum, sumsize - sizeof(struct jffs2_raw_summary));
 
        if (je32_to_cpu(summary->sum_crc) != crc) {
                dbg_summary("Summary node data is corrupt (bad CRC)\n");
@@ -560,7 +560,7 @@ crc_err:
 static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb,
                                        uint32_t infosize, uint32_t datasize, int padsize)
 {
-       struct jffs2_summary_node isum;
+       struct jffs2_raw_summary isum;
        union jffs2_sum_mem *temp;
        struct jffs2_sum_marker *sm;
        struct kvec vecs[2];
@@ -609,7 +609,7 @@ static int jffs2_sum_write_data(struct jffs2_sb_info *c, struct jffs2_eraseblock
                                sdrnt_ptr->nsize = c->summary->sum_list_head->d.nsize;
                                sdrnt_ptr->type = c->summary->sum_list_head->d.type;
 
-                               memcpy(sdrnt_ptr->name, c->summary->sum_list_head->d.name, 
+                               memcpy(sdrnt_ptr->name, c->summary->sum_list_head->d.name,
                                                        c->summary->sum_list_head->d.nsize);
 
                                wpage += JFFS2_SUMMARY_DIRENT_SIZE(c->summary->sum_list_head->d.nsize);
@@ -685,9 +685,9 @@ int jffs2_sum_write_sumnode(struct jffs2_sb_info *c)
        }
 
        datasize = c->summary->sum_size + sizeof(struct jffs2_sum_marker);
-       infosize = sizeof(struct jffs2_summary_node) + datasize;
+       infosize = sizeof(struct jffs2_raw_summary) + datasize;
        padsize = jeb->free_size - infosize;
-       infosize += padsize; 
+       infosize += padsize;
        datasize += padsize;
 
        /* Is there enough space for summary? */