[PATCH] fs/jffs/: cleanups

This patch contains the following cleanups:
- make needlessly global functions static
- provide some debugging helper functions only for appropriate
values of CONFIG_JFFS_FS_VERBOSE

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Adrian Bunk and committed by Linus Torvalds 94c9eca2 f15313bf

+112 -112
+56 -58
fs/jffs/intrep.c
··· 175 175 } 176 176 } 177 177 178 + /* Print the contents of a node. */ 179 + static void 180 + jffs_print_node(struct jffs_node *n) 181 + { 182 + D(printk("jffs_node: 0x%p\n", n)); 183 + D(printk("{\n")); 184 + D(printk(" 0x%08x, /* version */\n", n->version)); 185 + D(printk(" 0x%08x, /* data_offset */\n", n->data_offset)); 186 + D(printk(" 0x%08x, /* data_size */\n", n->data_size)); 187 + D(printk(" 0x%08x, /* removed_size */\n", n->removed_size)); 188 + D(printk(" 0x%08x, /* fm_offset */\n", n->fm_offset)); 189 + D(printk(" 0x%02x, /* name_size */\n", n->name_size)); 190 + D(printk(" 0x%p, /* fm, fm->offset: %u */\n", 191 + n->fm, (n->fm ? n->fm->offset : 0))); 192 + D(printk(" 0x%p, /* version_prev */\n", n->version_prev)); 193 + D(printk(" 0x%p, /* version_next */\n", n->version_next)); 194 + D(printk(" 0x%p, /* range_prev */\n", n->range_prev)); 195 + D(printk(" 0x%p, /* range_next */\n", n->range_next)); 196 + D(printk("}\n")); 197 + } 198 + 178 199 #endif 200 + 201 + /* Print the contents of a raw inode. */ 202 + static void 203 + jffs_print_raw_inode(struct jffs_raw_inode *raw_inode) 204 + { 205 + D(printk("jffs_raw_inode: inode number: %u\n", raw_inode->ino)); 206 + D(printk("{\n")); 207 + D(printk(" 0x%08x, /* magic */\n", raw_inode->magic)); 208 + D(printk(" 0x%08x, /* ino */\n", raw_inode->ino)); 209 + D(printk(" 0x%08x, /* pino */\n", raw_inode->pino)); 210 + D(printk(" 0x%08x, /* version */\n", raw_inode->version)); 211 + D(printk(" 0x%08x, /* mode */\n", raw_inode->mode)); 212 + D(printk(" 0x%04x, /* uid */\n", raw_inode->uid)); 213 + D(printk(" 0x%04x, /* gid */\n", raw_inode->gid)); 214 + D(printk(" 0x%08x, /* atime */\n", raw_inode->atime)); 215 + D(printk(" 0x%08x, /* mtime */\n", raw_inode->mtime)); 216 + D(printk(" 0x%08x, /* ctime */\n", raw_inode->ctime)); 217 + D(printk(" 0x%08x, /* offset */\n", raw_inode->offset)); 218 + D(printk(" 0x%08x, /* dsize */\n", raw_inode->dsize)); 219 + D(printk(" 0x%08x, /* rsize */\n", raw_inode->rsize)); 220 + D(printk(" 0x%02x, /* nsize */\n", raw_inode->nsize)); 221 + D(printk(" 0x%02x, /* nlink */\n", raw_inode->nlink)); 222 + D(printk(" 0x%02x, /* spare */\n", 223 + raw_inode->spare)); 224 + D(printk(" %u, /* rename */\n", 225 + raw_inode->rename)); 226 + D(printk(" %u, /* deleted */\n", 227 + raw_inode->deleted)); 228 + D(printk(" 0x%02x, /* accurate */\n", 229 + raw_inode->accurate)); 230 + D(printk(" 0x%08x, /* dchksum */\n", raw_inode->dchksum)); 231 + D(printk(" 0x%04x, /* nchksum */\n", raw_inode->nchksum)); 232 + D(printk(" 0x%04x, /* chksum */\n", raw_inode->chksum)); 233 + D(printk("}\n")); 234 + } 179 235 180 236 #define flash_safe_acquire(arg) 181 237 #define flash_safe_release(arg) ··· 2562 2506 } 2563 2507 return 0; 2564 2508 } 2565 - 2566 - /* Print the contents of a node. */ 2567 - void 2568 - jffs_print_node(struct jffs_node *n) 2569 - { 2570 - D(printk("jffs_node: 0x%p\n", n)); 2571 - D(printk("{\n")); 2572 - D(printk(" 0x%08x, /* version */\n", n->version)); 2573 - D(printk(" 0x%08x, /* data_offset */\n", n->data_offset)); 2574 - D(printk(" 0x%08x, /* data_size */\n", n->data_size)); 2575 - D(printk(" 0x%08x, /* removed_size */\n", n->removed_size)); 2576 - D(printk(" 0x%08x, /* fm_offset */\n", n->fm_offset)); 2577 - D(printk(" 0x%02x, /* name_size */\n", n->name_size)); 2578 - D(printk(" 0x%p, /* fm, fm->offset: %u */\n", 2579 - n->fm, (n->fm ? n->fm->offset : 0))); 2580 - D(printk(" 0x%p, /* version_prev */\n", n->version_prev)); 2581 - D(printk(" 0x%p, /* version_next */\n", n->version_next)); 2582 - D(printk(" 0x%p, /* range_prev */\n", n->range_prev)); 2583 - D(printk(" 0x%p, /* range_next */\n", n->range_next)); 2584 - D(printk("}\n")); 2585 - } 2586 - 2587 - 2588 - /* Print the contents of a raw inode. */ 2589 - void 2590 - jffs_print_raw_inode(struct jffs_raw_inode *raw_inode) 2591 - { 2592 - D(printk("jffs_raw_inode: inode number: %u\n", raw_inode->ino)); 2593 - D(printk("{\n")); 2594 - D(printk(" 0x%08x, /* magic */\n", raw_inode->magic)); 2595 - D(printk(" 0x%08x, /* ino */\n", raw_inode->ino)); 2596 - D(printk(" 0x%08x, /* pino */\n", raw_inode->pino)); 2597 - D(printk(" 0x%08x, /* version */\n", raw_inode->version)); 2598 - D(printk(" 0x%08x, /* mode */\n", raw_inode->mode)); 2599 - D(printk(" 0x%04x, /* uid */\n", raw_inode->uid)); 2600 - D(printk(" 0x%04x, /* gid */\n", raw_inode->gid)); 2601 - D(printk(" 0x%08x, /* atime */\n", raw_inode->atime)); 2602 - D(printk(" 0x%08x, /* mtime */\n", raw_inode->mtime)); 2603 - D(printk(" 0x%08x, /* ctime */\n", raw_inode->ctime)); 2604 - D(printk(" 0x%08x, /* offset */\n", raw_inode->offset)); 2605 - D(printk(" 0x%08x, /* dsize */\n", raw_inode->dsize)); 2606 - D(printk(" 0x%08x, /* rsize */\n", raw_inode->rsize)); 2607 - D(printk(" 0x%02x, /* nsize */\n", raw_inode->nsize)); 2608 - D(printk(" 0x%02x, /* nlink */\n", raw_inode->nlink)); 2609 - D(printk(" 0x%02x, /* spare */\n", 2610 - raw_inode->spare)); 2611 - D(printk(" %u, /* rename */\n", 2612 - raw_inode->rename)); 2613 - D(printk(" %u, /* deleted */\n", 2614 - raw_inode->deleted)); 2615 - D(printk(" 0x%02x, /* accurate */\n", 2616 - raw_inode->accurate)); 2617 - D(printk(" 0x%08x, /* dchksum */\n", raw_inode->dchksum)); 2618 - D(printk(" 0x%04x, /* nchksum */\n", raw_inode->nchksum)); 2619 - D(printk(" 0x%04x, /* chksum */\n", raw_inode->chksum)); 2620 - D(printk("}\n")); 2621 - } 2622 - 2623 2509 2624 2510 /* Print the contents of a file. */ 2625 2511 #if 0
-2
fs/jffs/intrep.h
··· 49 49 void jffs_garbage_collect_trigger(struct jffs_control *c); 50 50 51 51 /* For debugging purposes. */ 52 - void jffs_print_node(struct jffs_node *n); 53 - void jffs_print_raw_inode(struct jffs_raw_inode *raw_inode); 54 52 #if 0 55 53 int jffs_print_file(struct jffs_file *f); 56 54 #endif /* 0 */
+54 -51
fs/jffs/jffs_fm.c
··· 31 31 extern kmem_cache_t *fm_cache; 32 32 extern kmem_cache_t *node_cache; 33 33 34 + #if CONFIG_JFFS_FS_VERBOSE > 0 35 + void 36 + jffs_print_fmcontrol(struct jffs_fmcontrol *fmc) 37 + { 38 + D(printk("struct jffs_fmcontrol: 0x%p\n", fmc)); 39 + D(printk("{\n")); 40 + D(printk(" %u, /* flash_size */\n", fmc->flash_size)); 41 + D(printk(" %u, /* used_size */\n", fmc->used_size)); 42 + D(printk(" %u, /* dirty_size */\n", fmc->dirty_size)); 43 + D(printk(" %u, /* free_size */\n", fmc->free_size)); 44 + D(printk(" %u, /* sector_size */\n", fmc->sector_size)); 45 + D(printk(" %u, /* min_free_size */\n", fmc->min_free_size)); 46 + D(printk(" %u, /* max_chunk_size */\n", fmc->max_chunk_size)); 47 + D(printk(" 0x%p, /* mtd */\n", fmc->mtd)); 48 + D(printk(" 0x%p, /* head */ " 49 + "(head->offset = 0x%08x)\n", 50 + fmc->head, (fmc->head ? fmc->head->offset : 0))); 51 + D(printk(" 0x%p, /* tail */ " 52 + "(tail->offset + tail->size = 0x%08x)\n", 53 + fmc->tail, 54 + (fmc->tail ? fmc->tail->offset + fmc->tail->size : 0))); 55 + D(printk(" 0x%p, /* head_extra */\n", fmc->head_extra)); 56 + D(printk(" 0x%p, /* tail_extra */\n", fmc->tail_extra)); 57 + D(printk("}\n")); 58 + } 59 + #endif /* CONFIG_JFFS_FS_VERBOSE > 0 */ 60 + 61 + #if CONFIG_JFFS_FS_VERBOSE > 2 62 + static void 63 + jffs_print_fm(struct jffs_fm *fm) 64 + { 65 + D(printk("struct jffs_fm: 0x%p\n", fm)); 66 + D(printk("{\n")); 67 + D(printk(" 0x%08x, /* offset */\n", fm->offset)); 68 + D(printk(" %u, /* size */\n", fm->size)); 69 + D(printk(" 0x%p, /* prev */\n", fm->prev)); 70 + D(printk(" 0x%p, /* next */\n", fm->next)); 71 + D(printk(" 0x%p, /* nodes */\n", fm->nodes)); 72 + D(printk("}\n")); 73 + } 74 + #endif /* CONFIG_JFFS_FS_VERBOSE > 2 */ 75 + 76 + #if 0 77 + void 78 + jffs_print_node_ref(struct jffs_node_ref *ref) 79 + { 80 + D(printk("struct jffs_node_ref: 0x%p\n", ref)); 81 + D(printk("{\n")); 82 + D(printk(" 0x%p, /* node */\n", ref->node)); 83 + D(printk(" 0x%p, /* next */\n", ref->next)); 84 + D(printk("}\n")); 85 + } 86 + #endif /* 0 */ 87 + 34 88 /* This function creates a new shiny flash memory control structure. */ 35 89 struct jffs_fmcontrol * 36 90 jffs_build_begin(struct jffs_control *c, int unit) ··· 796 742 { 797 743 return no_jffs_node; 798 744 } 799 - 800 - void 801 - jffs_print_fmcontrol(struct jffs_fmcontrol *fmc) 802 - { 803 - D(printk("struct jffs_fmcontrol: 0x%p\n", fmc)); 804 - D(printk("{\n")); 805 - D(printk(" %u, /* flash_size */\n", fmc->flash_size)); 806 - D(printk(" %u, /* used_size */\n", fmc->used_size)); 807 - D(printk(" %u, /* dirty_size */\n", fmc->dirty_size)); 808 - D(printk(" %u, /* free_size */\n", fmc->free_size)); 809 - D(printk(" %u, /* sector_size */\n", fmc->sector_size)); 810 - D(printk(" %u, /* min_free_size */\n", fmc->min_free_size)); 811 - D(printk(" %u, /* max_chunk_size */\n", fmc->max_chunk_size)); 812 - D(printk(" 0x%p, /* mtd */\n", fmc->mtd)); 813 - D(printk(" 0x%p, /* head */ " 814 - "(head->offset = 0x%08x)\n", 815 - fmc->head, (fmc->head ? fmc->head->offset : 0))); 816 - D(printk(" 0x%p, /* tail */ " 817 - "(tail->offset + tail->size = 0x%08x)\n", 818 - fmc->tail, 819 - (fmc->tail ? fmc->tail->offset + fmc->tail->size : 0))); 820 - D(printk(" 0x%p, /* head_extra */\n", fmc->head_extra)); 821 - D(printk(" 0x%p, /* tail_extra */\n", fmc->tail_extra)); 822 - D(printk("}\n")); 823 - } 824 - 825 - void 826 - jffs_print_fm(struct jffs_fm *fm) 827 - { 828 - D(printk("struct jffs_fm: 0x%p\n", fm)); 829 - D(printk("{\n")); 830 - D(printk(" 0x%08x, /* offset */\n", fm->offset)); 831 - D(printk(" %u, /* size */\n", fm->size)); 832 - D(printk(" 0x%p, /* prev */\n", fm->prev)); 833 - D(printk(" 0x%p, /* next */\n", fm->next)); 834 - D(printk(" 0x%p, /* nodes */\n", fm->nodes)); 835 - D(printk("}\n")); 836 - } 837 - 838 - #if 0 839 - void 840 - jffs_print_node_ref(struct jffs_node_ref *ref) 841 - { 842 - D(printk("struct jffs_node_ref: 0x%p\n", ref)); 843 - D(printk("{\n")); 844 - D(printk(" 0x%p, /* node */\n", ref->node)); 845 - D(printk(" 0x%p, /* next */\n", ref->next)); 846 - D(printk("}\n")); 847 - } 848 - #endif /* 0 */ 849 -
+2 -1
fs/jffs/jffs_fm.h
··· 139 139 void jffs_fmfree_partly(struct jffs_fmcontrol *fmc, struct jffs_fm *fm, 140 140 __u32 size); 141 141 142 + #if CONFIG_JFFS_FS_VERBOSE > 0 142 143 void jffs_print_fmcontrol(struct jffs_fmcontrol *fmc); 143 - void jffs_print_fm(struct jffs_fm *fm); 144 + #endif 144 145 #if 0 145 146 void jffs_print_node_ref(struct jffs_node_ref *ref); 146 147 #endif /* 0 */