diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-04-28 10:59:12 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-28 10:59:12 -0400 |
commit | 08bc2dbc7327e89b9d5b9c8ef9401d1df2622fca (patch) | |
tree | 2c16cbd9f5bd856b00ef0a0d9f88b3afa67712ee /fs/gfs2/ondisk.c | |
parent | c56b39cd2c55d521597f04bbd872a08d1c4373ca (diff) |
[GFS2] [-mm patch] fs/gfs2/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- #if 0 unused functions
- remove the following global function that was both unused and
unimplemented:
- super.c: gfs2_do_upgrade()
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ondisk.c')
-rw-r--r-- | fs/gfs2/ondisk.c | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c index acfc944ce13e..b11e659bdd9e 100644 --- a/fs/gfs2/ondisk.c +++ b/fs/gfs2/ondisk.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * @count: the number of bytes | 28 | * @count: the number of bytes |
29 | * | 29 | * |
30 | */ | 30 | */ |
31 | 31 | #if 0 | |
32 | static void print_array(char *title, char *buf, int count) | 32 | static void print_array(char *title, char *buf, int count) |
33 | { | 33 | { |
34 | int x; | 34 | int x; |
@@ -42,6 +42,7 @@ static void print_array(char *title, char *buf, int count) | |||
42 | if (x % 16) | 42 | if (x % 16) |
43 | printk("\n"); | 43 | printk("\n"); |
44 | } | 44 | } |
45 | #endif /* 0 */ | ||
45 | 46 | ||
46 | /* | 47 | /* |
47 | * gfs2_xxx_in - read in an xxx struct | 48 | * gfs2_xxx_in - read in an xxx struct |
@@ -72,7 +73,7 @@ void gfs2_inum_out(const struct gfs2_inum *no, char *buf) | |||
72 | str->no_addr = cpu_to_be64(no->no_addr); | 73 | str->no_addr = cpu_to_be64(no->no_addr); |
73 | } | 74 | } |
74 | 75 | ||
75 | void gfs2_inum_print(struct gfs2_inum *no) | 76 | static void gfs2_inum_print(struct gfs2_inum *no) |
76 | { | 77 | { |
77 | pv(no, no_formal_ino, "%llu"); | 78 | pv(no, no_formal_ino, "%llu"); |
78 | pv(no, no_addr, "%llu"); | 79 | pv(no, no_addr, "%llu"); |
@@ -96,7 +97,7 @@ static void gfs2_meta_header_out(struct gfs2_meta_header *mh, char *buf) | |||
96 | str->mh_format = cpu_to_be32(mh->mh_format); | 97 | str->mh_format = cpu_to_be32(mh->mh_format); |
97 | } | 98 | } |
98 | 99 | ||
99 | void gfs2_meta_header_print(struct gfs2_meta_header *mh) | 100 | static void gfs2_meta_header_print(struct gfs2_meta_header *mh) |
100 | { | 101 | { |
101 | pv(mh, mh_magic, "0x%.8X"); | 102 | pv(mh, mh_magic, "0x%.8X"); |
102 | pv(mh, mh_type, "%u"); | 103 | pv(mh, mh_type, "%u"); |
@@ -121,6 +122,7 @@ void gfs2_sb_in(struct gfs2_sb *sb, char *buf) | |||
121 | memcpy(sb->sb_locktable, str->sb_locktable, GFS2_LOCKNAME_LEN); | 122 | memcpy(sb->sb_locktable, str->sb_locktable, GFS2_LOCKNAME_LEN); |
122 | } | 123 | } |
123 | 124 | ||
125 | #if 0 | ||
124 | void gfs2_sb_print(struct gfs2_sb *sb) | 126 | void gfs2_sb_print(struct gfs2_sb *sb) |
125 | { | 127 | { |
126 | gfs2_meta_header_print(&sb->sb_header); | 128 | gfs2_meta_header_print(&sb->sb_header); |
@@ -136,6 +138,7 @@ void gfs2_sb_print(struct gfs2_sb *sb) | |||
136 | pv(sb, sb_lockproto, "%s"); | 138 | pv(sb, sb_lockproto, "%s"); |
137 | pv(sb, sb_locktable, "%s"); | 139 | pv(sb, sb_locktable, "%s"); |
138 | } | 140 | } |
141 | #endif /* 0 */ | ||
139 | 142 | ||
140 | void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf) | 143 | void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf) |
141 | { | 144 | { |
@@ -149,6 +152,7 @@ void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf) | |||
149 | 152 | ||
150 | } | 153 | } |
151 | 154 | ||
155 | #if 0 | ||
152 | void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf) | 156 | void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf) |
153 | { | 157 | { |
154 | struct gfs2_rindex *str = (struct gfs2_rindex *)buf; | 158 | struct gfs2_rindex *str = (struct gfs2_rindex *)buf; |
@@ -163,6 +167,8 @@ void gfs2_rindex_out(struct gfs2_rindex *ri, char *buf) | |||
163 | memset(str->ri_reserved, 0, sizeof(str->ri_reserved)); | 167 | memset(str->ri_reserved, 0, sizeof(str->ri_reserved)); |
164 | } | 168 | } |
165 | 169 | ||
170 | #endif /* 0 */ | ||
171 | |||
166 | void gfs2_rindex_print(struct gfs2_rindex *ri) | 172 | void gfs2_rindex_print(struct gfs2_rindex *ri) |
167 | { | 173 | { |
168 | pv(ri, ri_addr, "%llu"); | 174 | pv(ri, ri_addr, "%llu"); |
@@ -196,6 +202,7 @@ void gfs2_rgrp_out(struct gfs2_rgrp *rg, char *buf) | |||
196 | memset(&str->rg_reserved, 0, sizeof(str->rg_reserved)); | 202 | memset(&str->rg_reserved, 0, sizeof(str->rg_reserved)); |
197 | } | 203 | } |
198 | 204 | ||
205 | #if 0 | ||
199 | void gfs2_rgrp_print(struct gfs2_rgrp *rg) | 206 | void gfs2_rgrp_print(struct gfs2_rgrp *rg) |
200 | { | 207 | { |
201 | gfs2_meta_header_print(&rg->rg_header); | 208 | gfs2_meta_header_print(&rg->rg_header); |
@@ -205,6 +212,7 @@ void gfs2_rgrp_print(struct gfs2_rgrp *rg) | |||
205 | 212 | ||
206 | pa(rg, rg_reserved, 36); | 213 | pa(rg, rg_reserved, 36); |
207 | } | 214 | } |
215 | #endif /* 0 */ | ||
208 | 216 | ||
209 | void gfs2_quota_in(struct gfs2_quota *qu, char *buf) | 217 | void gfs2_quota_in(struct gfs2_quota *qu, char *buf) |
210 | { | 218 | { |
@@ -215,6 +223,8 @@ void gfs2_quota_in(struct gfs2_quota *qu, char *buf) | |||
215 | qu->qu_value = be64_to_cpu(str->qu_value); | 223 | qu->qu_value = be64_to_cpu(str->qu_value); |
216 | } | 224 | } |
217 | 225 | ||
226 | #if 0 | ||
227 | |||
218 | void gfs2_quota_out(struct gfs2_quota *qu, char *buf) | 228 | void gfs2_quota_out(struct gfs2_quota *qu, char *buf) |
219 | { | 229 | { |
220 | struct gfs2_quota *str = (struct gfs2_quota *)buf; | 230 | struct gfs2_quota *str = (struct gfs2_quota *)buf; |
@@ -231,6 +241,8 @@ void gfs2_quota_print(struct gfs2_quota *qu) | |||
231 | pv(qu, qu_value, "%lld"); | 241 | pv(qu, qu_value, "%lld"); |
232 | } | 242 | } |
233 | 243 | ||
244 | #endif /* 0 */ | ||
245 | |||
234 | void gfs2_dinode_in(struct gfs2_dinode *di, char *buf) | 246 | void gfs2_dinode_in(struct gfs2_dinode *di, char *buf) |
235 | { | 247 | { |
236 | struct gfs2_dinode *str = (struct gfs2_dinode *)buf; | 248 | struct gfs2_dinode *str = (struct gfs2_dinode *)buf; |
@@ -327,6 +339,8 @@ void gfs2_dinode_print(struct gfs2_dinode *di) | |||
327 | pv(di, di_eattr, "%llu"); | 339 | pv(di, di_eattr, "%llu"); |
328 | } | 340 | } |
329 | 341 | ||
342 | #if 0 | ||
343 | |||
330 | void gfs2_dirent_print(struct gfs2_dirent *de, char *name) | 344 | void gfs2_dirent_print(struct gfs2_dirent *de, char *name) |
331 | { | 345 | { |
332 | char buf[GFS2_FNAMESIZE + 1]; | 346 | char buf[GFS2_FNAMESIZE + 1]; |
@@ -394,6 +408,8 @@ void gfs2_ea_header_print(struct gfs2_ea_header *ea, char *name) | |||
394 | printk(KERN_INFO " name = %s\n", buf); | 408 | printk(KERN_INFO " name = %s\n", buf); |
395 | } | 409 | } |
396 | 410 | ||
411 | #endif /* 0 */ | ||
412 | |||
397 | void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf) | 413 | void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf) |
398 | { | 414 | { |
399 | struct gfs2_log_header *str = (struct gfs2_log_header *)buf; | 415 | struct gfs2_log_header *str = (struct gfs2_log_header *)buf; |
@@ -406,6 +422,8 @@ void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf) | |||
406 | lh->lh_hash = be32_to_cpu(str->lh_hash); | 422 | lh->lh_hash = be32_to_cpu(str->lh_hash); |
407 | } | 423 | } |
408 | 424 | ||
425 | #if 0 | ||
426 | |||
409 | void gfs2_log_header_print(struct gfs2_log_header *lh) | 427 | void gfs2_log_header_print(struct gfs2_log_header *lh) |
410 | { | 428 | { |
411 | gfs2_meta_header_print(&lh->lh_header); | 429 | gfs2_meta_header_print(&lh->lh_header); |
@@ -427,6 +445,8 @@ void gfs2_log_descriptor_print(struct gfs2_log_descriptor *ld) | |||
427 | pa(ld, ld_reserved, 32); | 445 | pa(ld, ld_reserved, 32); |
428 | } | 446 | } |
429 | 447 | ||
448 | #endif /* 0 */ | ||
449 | |||
430 | void gfs2_inum_range_in(struct gfs2_inum_range *ir, char *buf) | 450 | void gfs2_inum_range_in(struct gfs2_inum_range *ir, char *buf) |
431 | { | 451 | { |
432 | struct gfs2_inum_range *str = (struct gfs2_inum_range *)buf; | 452 | struct gfs2_inum_range *str = (struct gfs2_inum_range *)buf; |
@@ -443,11 +463,13 @@ void gfs2_inum_range_out(struct gfs2_inum_range *ir, char *buf) | |||
443 | str->ir_length = cpu_to_be64(ir->ir_length); | 463 | str->ir_length = cpu_to_be64(ir->ir_length); |
444 | } | 464 | } |
445 | 465 | ||
466 | #if 0 | ||
446 | void gfs2_inum_range_print(struct gfs2_inum_range *ir) | 467 | void gfs2_inum_range_print(struct gfs2_inum_range *ir) |
447 | { | 468 | { |
448 | pv(ir, ir_start, "%llu"); | 469 | pv(ir, ir_start, "%llu"); |
449 | pv(ir, ir_length, "%llu"); | 470 | pv(ir, ir_length, "%llu"); |
450 | } | 471 | } |
472 | #endif /* 0 */ | ||
451 | 473 | ||
452 | void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf) | 474 | void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, char *buf) |
453 | { | 475 | { |
@@ -467,12 +489,14 @@ void gfs2_statfs_change_out(struct gfs2_statfs_change *sc, char *buf) | |||
467 | str->sc_dinodes = cpu_to_be64(sc->sc_dinodes); | 489 | str->sc_dinodes = cpu_to_be64(sc->sc_dinodes); |
468 | } | 490 | } |
469 | 491 | ||
492 | #if 0 | ||
470 | void gfs2_statfs_change_print(struct gfs2_statfs_change *sc) | 493 | void gfs2_statfs_change_print(struct gfs2_statfs_change *sc) |
471 | { | 494 | { |
472 | pv(sc, sc_total, "%lld"); | 495 | pv(sc, sc_total, "%lld"); |
473 | pv(sc, sc_free, "%lld"); | 496 | pv(sc, sc_free, "%lld"); |
474 | pv(sc, sc_dinodes, "%lld"); | 497 | pv(sc, sc_dinodes, "%lld"); |
475 | } | 498 | } |
499 | #endif /* 0 */ | ||
476 | 500 | ||
477 | void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf) | 501 | void gfs2_unlinked_tag_in(struct gfs2_unlinked_tag *ut, char *buf) |
478 | { | 502 | { |
@@ -491,12 +515,16 @@ void gfs2_unlinked_tag_out(struct gfs2_unlinked_tag *ut, char *buf) | |||
491 | str->__pad = 0; | 515 | str->__pad = 0; |
492 | } | 516 | } |
493 | 517 | ||
518 | #if 0 | ||
519 | |||
494 | void gfs2_unlinked_tag_print(struct gfs2_unlinked_tag *ut) | 520 | void gfs2_unlinked_tag_print(struct gfs2_unlinked_tag *ut) |
495 | { | 521 | { |
496 | gfs2_inum_print(&ut->ut_inum); | 522 | gfs2_inum_print(&ut->ut_inum); |
497 | pv(ut, ut_flags, "%u"); | 523 | pv(ut, ut_flags, "%u"); |
498 | } | 524 | } |
499 | 525 | ||
526 | #endif /* 0 */ | ||
527 | |||
500 | void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf) | 528 | void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf) |
501 | { | 529 | { |
502 | struct gfs2_quota_change *str = (struct gfs2_quota_change *)buf; | 530 | struct gfs2_quota_change *str = (struct gfs2_quota_change *)buf; |
@@ -506,6 +534,8 @@ void gfs2_quota_change_in(struct gfs2_quota_change *qc, char *buf) | |||
506 | qc->qc_id = be32_to_cpu(str->qc_id); | 534 | qc->qc_id = be32_to_cpu(str->qc_id); |
507 | } | 535 | } |
508 | 536 | ||
537 | #if 0 | ||
538 | |||
509 | void gfs2_quota_change_print(struct gfs2_quota_change *qc) | 539 | void gfs2_quota_change_print(struct gfs2_quota_change *qc) |
510 | { | 540 | { |
511 | pv(qc, qc_change, "%lld"); | 541 | pv(qc, qc_change, "%lld"); |
@@ -513,5 +543,5 @@ void gfs2_quota_change_print(struct gfs2_quota_change *qc) | |||
513 | pv(qc, qc_id, "%u"); | 543 | pv(qc, qc_id, "%u"); |
514 | } | 544 | } |
515 | 545 | ||
516 | 546 | #endif /* 0 */ | |
517 | 547 | ||