aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-07-26 01:06:14 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-07-26 01:06:14 +0200
commitf3ea792badae9cd7c4205ac363301f1e94e57d4e (patch)
tree84f72b1e4c02c3e01ca3e393edc789dcaeba6c69 /e2fsprogs
parentccb977186100ccf6b443c5f08c8b179c9b7e720b (diff)
downloadbusybox-w32-f3ea792badae9cd7c4205ac363301f1e94e57d4e.tar.gz
busybox-w32-f3ea792badae9cd7c4205ac363301f1e94e57d4e.tar.bz2
busybox-w32-f3ea792badae9cd7c4205ac363301f1e94e57d4e.zip
*: mass cosmetic removal of extra empty lines. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c34
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/alloc.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/alloc_tables.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c6
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/bitops.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/block.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/bmap.c3
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/bmove.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/brel.h1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/closefs.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/cmp_bitmaps.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/dir_iterate.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/dupfs.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/e2image.h13
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2_ext_attr.h1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2fsP.h2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/freefs.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ind_block.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/inline.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/inode.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/inode_io.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/jfs_dat.h2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/lookup.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c3
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/namei.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/newdir.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/read_bb.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/read_bb_file.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/rs_bitmap.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/swapfs.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/unlink.c1
-rw-r--r--e2fsprogs/old_e2fsprogs/util.c1
37 files changed, 11 insertions, 92 deletions
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 4c4c78d00..f58fe9286 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -517,7 +517,6 @@ static void dict_insert(dict_t *dict, dnode_t *node, const void *key)
517 } 517 }
518 518
519 dict_root(dict)->color = dnode_black; 519 dict_root(dict)->color = dnode_black;
520
521} 520}
522 521
523/* 522/*
@@ -801,7 +800,6 @@ static void e2fsck_add_dx_dir(e2fsck_t ctx, ext2_ino_t ino, int num_blocks)
801 dir->dx_block = e2fsck_allocate_memory(ctx, num_blocks 800 dir->dx_block = e2fsck_allocate_memory(ctx, num_blocks
802 * sizeof (struct dx_dirblock_info), 801 * sizeof (struct dx_dirblock_info),
803 "dx_block info array"); 802 "dx_block info array");
804
805} 803}
806 804
807/* 805/*
@@ -1724,7 +1722,6 @@ errout:
1724 ext2fs_free_mem(&j_inode); 1722 ext2fs_free_mem(&j_inode);
1725 ext2fs_free_mem(&journal); 1723 ext2fs_free_mem(&journal);
1726 return retval; 1724 return retval;
1727
1728} 1725}
1729 1726
1730static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx, 1727static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx,
@@ -3375,7 +3372,6 @@ static void e2fsck_pass1(e2fsck_t ctx)
3375 e2fsck_write_inode(ctx, ino, inode, 3372 e2fsck_write_inode(ctx, ino, inode,
3376 "pass1"); 3373 "pass1");
3377 } 3374 }
3378
3379 } 3375 }
3380 /* 3376 /*
3381 * If dtime is set, offer to clear it. mke2fs 3377 * If dtime is set, offer to clear it. mke2fs
@@ -3678,7 +3674,6 @@ endit:
3678 3674
3679 ext2fs_free_mem(&block_buf); 3675 ext2fs_free_mem(&block_buf);
3680 ext2fs_free_mem(&inode); 3676 ext2fs_free_mem(&inode);
3681
3682} 3677}
3683 3678
3684/* 3679/*
@@ -4451,8 +4446,7 @@ static void mark_table_blocks(e2fsck_t ctx)
4451 ctx->invalid_bitmaps++; 4446 ctx->invalid_bitmaps++;
4452 } 4447 }
4453 } else { 4448 } else {
4454 ext2fs_mark_block_bitmap(ctx->block_found_map, 4449 ext2fs_mark_block_bitmap(ctx->block_found_map, b);
4455 b);
4456 } 4450 }
4457 } 4451 }
4458 } 4452 }
@@ -4469,10 +4463,9 @@ static void mark_table_blocks(e2fsck_t ctx)
4469 ctx->invalid_bitmaps++; 4463 ctx->invalid_bitmaps++;
4470 } 4464 }
4471 } else { 4465 } else {
4472 ext2fs_mark_block_bitmap(ctx->block_found_map, 4466 ext2fs_mark_block_bitmap(ctx->block_found_map,
4473 fs->group_desc[i].bg_block_bitmap); 4467 fs->group_desc[i].bg_block_bitmap);
4474 } 4468 }
4475
4476 } 4469 }
4477 /* 4470 /*
4478 * Mark block used for the inode bitmap 4471 * Mark block used for the inode bitmap
@@ -4486,8 +4479,8 @@ static void mark_table_blocks(e2fsck_t ctx)
4486 ctx->invalid_bitmaps++; 4479 ctx->invalid_bitmaps++;
4487 } 4480 }
4488 } else { 4481 } else {
4489 ext2fs_mark_block_bitmap(ctx->block_found_map, 4482 ext2fs_mark_block_bitmap(ctx->block_found_map,
4490 fs->group_desc[i].bg_inode_bitmap); 4483 fs->group_desc[i].bg_inode_bitmap);
4491 } 4484 }
4492 } 4485 }
4493 block += fs->super->s_blocks_per_group; 4486 block += fs->super->s_blocks_per_group;
@@ -5588,7 +5581,6 @@ static void e2fsck_pass2(e2fsck_t ctx)
5588 ext2fs_mark_super_dirty(fs); 5581 ext2fs_mark_super_dirty(fs);
5589 } 5582 }
5590 } 5583 }
5591
5592} 5584}
5593 5585
5594#define MAX_DEPTH 32000 5586#define MAX_DEPTH 32000
@@ -9748,7 +9740,6 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
9748 if (print_answer) 9740 if (print_answer)
9749 printf("%s.\n", answer ? 9741 printf("%s.\n", answer ?
9750 _(preen_msg[(int) ptr->prompt]) : _("IGNORED")); 9742 _(preen_msg[(int) ptr->prompt]) : _("IGNORED"));
9751
9752 } 9743 }
9753 9744
9754 if ((ptr->prompt == PROMPT_ABORT) && answer) 9745 if ((ptr->prompt == PROMPT_ABORT) && answer)
@@ -11324,7 +11315,7 @@ static int release_inode_block(ext2_filsys fs, blk_t *block_nr,
11324 if ((blk < fs->super->s_first_data_block) || 11315 if ((blk < fs->super->s_first_data_block) ||
11325 (blk >= fs->super->s_blocks_count)) { 11316 (blk >= fs->super->s_blocks_count)) {
11326 fix_problem(ctx, PR_0_ORPHAN_ILLEGAL_BLOCK_NUM, pctx); 11317 fix_problem(ctx, PR_0_ORPHAN_ILLEGAL_BLOCK_NUM, pctx);
11327 return_abort: 11318 return_abort:
11328 pb->abort = 1; 11319 pb->abort = 1;
11329 return BLOCK_ABORT; 11320 return BLOCK_ABORT;
11330 } 11321 }
@@ -11537,7 +11528,7 @@ static int release_orphan_inodes(e2fsck_t ctx)
11537 } 11528 }
11538 ext2fs_free_mem(&block_buf); 11529 ext2fs_free_mem(&block_buf);
11539 return 0; 11530 return 0;
11540return_abort: 11531 return_abort:
11541 ext2fs_free_mem(&block_buf); 11532 ext2fs_free_mem(&block_buf);
11542 return 1; 11533 return 1;
11543} 11534}
@@ -11618,7 +11609,7 @@ static void check_resize_inode(e2fsck_t ctx)
11618 !(inode.i_mode & LINUX_S_IFREG) || 11609 !(inode.i_mode & LINUX_S_IFREG) ||
11619 (blk < fs->super->s_first_data_block || 11610 (blk < fs->super->s_first_data_block ||
11620 blk >= fs->super->s_blocks_count)) { 11611 blk >= fs->super->s_blocks_count)) {
11621 resize_inode_invalid: 11612 resize_inode_invalid:
11622 if (fix_problem(ctx, PR_0_RESIZE_INODE_INVALID, &pctx)) { 11613 if (fix_problem(ctx, PR_0_RESIZE_INODE_INVALID, &pctx)) {
11623 memset(&inode, 0, sizeof(inode)); 11614 memset(&inode, 0, sizeof(inode));
11624 e2fsck_write_inode(ctx, EXT2_RESIZE_INO, &inode, 11615 e2fsck_write_inode(ctx, EXT2_RESIZE_INO, &inode,
@@ -11660,10 +11651,9 @@ static void check_resize_inode(e2fsck_t ctx)
11660 } 11651 }
11661 } 11652 }
11662 11653
11663cleanup: 11654 cleanup:
11664 ext2fs_free_mem(&dind_buf); 11655 ext2fs_free_mem(&dind_buf);
11665 11656}
11666 }
11667 11657
11668static void check_super_block(e2fsck_t ctx) 11658static void check_super_block(e2fsck_t ctx)
11669{ 11659{
@@ -11842,7 +11832,6 @@ static void check_super_block(e2fsck_t ctx)
11842 (gd->bg_free_inodes_count > sb->s_inodes_per_group) || 11832 (gd->bg_free_inodes_count > sb->s_inodes_per_group) ||
11843 (gd->bg_used_dirs_count > sb->s_inodes_per_group)) 11833 (gd->bg_used_dirs_count > sb->s_inodes_per_group))
11844 ext2fs_unmark_valid(fs); 11834 ext2fs_unmark_valid(fs);
11845
11846 } 11835 }
11847 11836
11848 /* 11837 /*
@@ -11902,7 +11891,6 @@ static void check_super_block(e2fsck_t ctx)
11902 fs->super->s_feature_incompat &= 11891 fs->super->s_feature_incompat &=
11903 ~EXT2_FEATURE_INCOMPAT_FILETYPE; 11892 ~EXT2_FEATURE_INCOMPAT_FILETYPE;
11904 ext2fs_mark_super_dirty(fs); 11893 ext2fs_mark_super_dirty(fs);
11905
11906 } 11894 }
11907 } 11895 }
11908 11896
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c b/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c
index 5021d72c9..cbb63e15a 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/alloc.c
@@ -171,4 +171,3 @@ errcode_t ext2fs_get_free_blocks(ext2_filsys fs, blk_t start, blk_t finish,
171 } while (b != finish); 171 } while (b != finish);
172 return EXT2_ET_BLOCK_ALLOC_FAIL; 172 return EXT2_ET_BLOCK_ALLOC_FAIL;
173} 173}
174
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/alloc_tables.c b/e2fsprogs/old_e2fsprogs/ext2fs/alloc_tables.c
index b2d786ed8..7c60e2bf5 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/alloc_tables.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/alloc_tables.c
@@ -97,12 +97,9 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
97 fs->group_desc[group].bg_inode_table = new_blk; 97 fs->group_desc[group].bg_inode_table = new_blk;
98 } 98 }
99 99
100
101 return 0; 100 return 0;
102} 101}
103 102
104
105
106errcode_t ext2fs_allocate_tables(ext2_filsys fs) 103errcode_t ext2fs_allocate_tables(ext2_filsys fs)
107{ 104{
108 errcode_t retval; 105 errcode_t retval;
@@ -115,4 +112,3 @@ errcode_t ext2fs_allocate_tables(ext2_filsys fs)
115 } 112 }
116 return 0; 113 return 0;
117} 114}
118
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c b/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c
index 1deae54e8..a96789618 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/bb_inode.c
@@ -260,9 +260,3 @@ static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
260 *block_nr = blk; 260 *block_nr = blk;
261 return BLOCK_CHANGED; 261 return BLOCK_CHANGED;
262} 262}
263
264
265
266
267
268
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bitops.c b/e2fsprogs/old_e2fsprogs/ext2fs/bitops.c
index 987061130..3cf157949 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/bitops.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/bitops.c
@@ -88,4 +88,3 @@ void ext2fs_warn_bitmap2(ext2fs_generic_bitmap bitmap,
88 bb_error_msg("#%lu", arg); 88 bb_error_msg("#%lu", arg);
89#endif 89#endif
90} 90}
91
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/block.c b/e2fsprogs/old_e2fsprogs/ext2fs/block.c
index 498096995..dbd04f846 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/block.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/block.c
@@ -435,4 +435,3 @@ errcode_t ext2fs_block_iterate(ext2_filsys fs,
435 return ext2fs_block_iterate2(fs, ino, BLOCK_FLAG_NO_LARGE | flags, 435 return ext2fs_block_iterate2(fs, ino, BLOCK_FLAG_NO_LARGE | flags,
436 block_buf, xlate_func, &xl); 436 block_buf, xlate_func, &xl);
437} 437}
438
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c b/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c
index b2d0279d8..796b0e4f5 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/bmap.c
@@ -259,6 +259,3 @@ done:
259 } 259 }
260 return retval; 260 return retval;
261} 261}
262
263
264
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bmove.c b/e2fsprogs/old_e2fsprogs/ext2fs/bmove.c
index 635410da5..ec9244d0b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/bmove.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/bmove.c
@@ -153,4 +153,3 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs,
153 } 153 }
154 return 0; 154 return 0;
155} 155}
156
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/brel.h b/e2fsprogs/old_e2fsprogs/ext2fs/brel.h
index 216fd132c..87bf72be4 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/brel.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/brel.h
@@ -84,4 +84,3 @@ errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
84#define ext2fs_brel_move(brel, old, new) ((brel)->move((brel), old, new)) 84#define ext2fs_brel_move(brel, old, new) ((brel)->move((brel), old, new))
85#define ext2fs_brel_delete(brel, old) ((brel)->delete((brel), old)) 85#define ext2fs_brel_delete(brel, old) ((brel)->delete((brel), old))
86#define ext2fs_brel_free(brel) ((brel)->free((brel))) 86#define ext2fs_brel_free(brel) ((brel)->free((brel)))
87
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c b/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c
index 7ba7f22e2..bfa15e22a 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/closefs.c
@@ -378,4 +378,3 @@ errcode_t ext2fs_close(ext2_filsys fs)
378 ext2fs_free(fs); 378 ext2fs_free(fs);
379 return 0; 379 return 0;
380} 380}
381
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/cmp_bitmaps.c b/e2fsprogs/old_e2fsprogs/ext2fs/cmp_bitmaps.c
index 05b8eb8d7..7f78ff804 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/cmp_bitmaps.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/cmp_bitmaps.c
@@ -70,4 +70,3 @@ errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
70 70
71 return 0; 71 return 0;
72} 72}
73
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/dir_iterate.c b/e2fsprogs/old_e2fsprogs/ext2fs/dir_iterate.c
index b7d873595..eb5dae0a6 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/dir_iterate.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/dir_iterate.c
@@ -217,4 +217,3 @@ next:
217 return BLOCK_ABORT; 217 return BLOCK_ABORT;
218 return 0; 218 return 0;
219} 219}
220
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c b/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c
index f651338e3..f9c5a104b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/dirblock.c
@@ -130,4 +130,3 @@ errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
130{ 130{
131 return ext2fs_write_dir_block2(fs, block, inbuf, 0); 131 return ext2fs_write_dir_block2(fs, block, inbuf, 0);
132} 132}
133
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/dupfs.c b/e2fsprogs/old_e2fsprogs/ext2fs/dupfs.c
index 203c29fe3..d1879377a 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/dupfs.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/dupfs.c
@@ -92,6 +92,4 @@ errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest)
92errout: 92errout:
93 ext2fs_free(fs); 93 ext2fs_free(fs);
94 return retval; 94 return retval;
95
96} 95}
97
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/e2image.h b/e2fsprogs/old_e2fsprogs/ext2fs/e2image.h
index 8d38ecc13..a598d0111 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/e2image.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/e2image.h
@@ -37,16 +37,3 @@ struct ext2_image_hdr {
37 __u32 offset_blockmap; /* Byte offset of the inode bitmaps */ 37 __u32 offset_blockmap; /* Byte offset of the inode bitmaps */
38 __u32 offset_reserved[8]; 38 __u32 offset_reserved[8];
39}; 39};
40
41
42
43
44
45
46
47
48
49
50
51
52
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_ext_attr.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_ext_attr.h
index cc91bb8d6..ca309c0d0 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_ext_attr.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_ext_attr.h
@@ -50,4 +50,3 @@ struct ext2_ext_attr_entry {
50 sizeof(struct ext2_xattr_entry)) & ~EXT2_EXT_ATTR_ROUND) 50 sizeof(struct ext2_xattr_entry)) & ~EXT2_EXT_ATTR_ROUND)
51#define EXT2_XATTR_SIZE(size) \ 51#define EXT2_XATTR_SIZE(size) \
52 (((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND) 52 (((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND)
53
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fsP.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fsP.h
index 908b5d9a4..7a02e9a8e 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fsP.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fsP.h
@@ -85,5 +85,3 @@ extern int ext2fs_process_dir_block(ext2_filsys fs,
85 blk_t ref_block, 85 blk_t ref_block,
86 int ref_offset, 86 int ref_offset,
87 void *priv_data); 87 void *priv_data);
88
89
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/freefs.c b/e2fsprogs/old_e2fsprogs/ext2fs/freefs.c
index 65c4ee794..0c5d48b11 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/freefs.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/freefs.c
@@ -125,4 +125,3 @@ void ext2fs_free_dblist(ext2_dblist dblist)
125 dblist->magic = 0; 125 dblist->magic = 0;
126 ext2fs_free_mem(&dblist); 126 ext2fs_free_mem(&dblist);
127} 127}
128
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c b/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c
index a98b2b9e5..a3bbad851 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c
@@ -153,5 +153,4 @@ errcode_t ext2fs_get_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino,
153 retval = ext2fs_get_pathname_int(fs, dir, ino, 32, buf, name); 153 retval = ext2fs_get_pathname_int(fs, dir, ino, 32, buf, name);
154 ext2fs_free_mem(&buf); 154 ext2fs_free_mem(&buf);
155 return retval; 155 return retval;
156
157} 156}
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ind_block.c b/e2fsprogs/old_e2fsprogs/ext2fs/ind_block.c
index c86a1c59a..a1038300b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ind_block.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ind_block.c
@@ -67,5 +67,3 @@ errcode_t ext2fs_write_ind_block(ext2_filsys fs, blk_t blk, void *buf)
67#endif 67#endif
68 return io_channel_write_blk(fs->io, blk, 1, buf); 68 return io_channel_write_blk(fs->io, blk, 1, buf);
69} 69}
70
71
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/inline.c b/e2fsprogs/old_e2fsprogs/ext2fs/inline.c
index 9b620a772..d328cc950 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/inline.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/inline.c
@@ -30,4 +30,3 @@
30#include "ext2_fs.h" 30#include "ext2_fs.h"
31#define INCLUDE_INLINE_FUNCS 31#define INCLUDE_INLINE_FUNCS
32#include "ext2fs.h" 32#include "ext2fs.h"
33
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/inode.c b/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
index 5e0d081bd..7a1d5c94b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
@@ -764,4 +764,3 @@ errcode_t ext2fs_check_directory(ext2_filsys fs, ext2_ino_t ino)
764 return EXT2_ET_NO_DIRECTORY; 764 return EXT2_ET_NO_DIRECTORY;
765 return 0; 765 return 0;
766} 766}
767
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/inode_io.c b/e2fsprogs/old_e2fsprogs/ext2fs/inode_io.c
index 4bfa93aef..b861d5ff6 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/inode_io.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/inode_io.c
@@ -268,4 +268,3 @@ static errcode_t inode_flush(io_channel channel)
268 268
269 return ext2fs_file_flush(data->file); 269 return ext2fs_file_flush(data->file);
270} 270}
271
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/jfs_dat.h b/e2fsprogs/old_e2fsprogs/ext2fs/jfs_dat.h
index 136635de0..17c586a29 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/jfs_dat.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/jfs_dat.h
@@ -60,6 +60,4 @@ typedef struct journal_superblock_s
60 /* Dynamic information describing the current state of the log */ 60 /* Dynamic information describing the current state of the log */
61 __u32 s_sequence; /* first commit ID expected in log */ 61 __u32 s_sequence; /* first commit ID expected in log */
62 __u32 s_start; /* blocknr of start of log */ 62 __u32 s_start; /* blocknr of start of log */
63
64} journal_superblock_t; 63} journal_superblock_t;
65
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/lookup.c b/e2fsprogs/old_e2fsprogs/ext2fs/lookup.c
index 31b30a182..b2e8de8ec 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/lookup.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/lookup.c
@@ -66,5 +66,3 @@ errcode_t ext2fs_lookup(ext2_filsys fs, ext2_ino_t dir, const char *name,
66 66
67 return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND; 67 return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND;
68} 68}
69
70
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c b/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c
index 93f47b06f..a86ac8e93 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/mkdir.c
@@ -136,7 +136,4 @@ errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum,
136cleanup: 136cleanup:
137 ext2fs_free_mem(&block); 137 ext2fs_free_mem(&block);
138 return retval; 138 return retval;
139
140} 139}
141
142
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c b/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c
index db1c8bff3..748d9abc7 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/mkjournal.c
@@ -188,7 +188,6 @@ static int mkjournal_proc(ext2_filsys fs,
188 return (BLOCK_CHANGED | BLOCK_ABORT); 188 return (BLOCK_CHANGED | BLOCK_ABORT);
189 else 189 else
190 return BLOCK_CHANGED; 190 return BLOCK_CHANGED;
191
192} 191}
193 192
194/* 193/*
@@ -423,6 +422,5 @@ main(int argc, char **argv)
423 } 422 }
424 ext2fs_close(fs); 423 ext2fs_close(fs);
425 exit(0); 424 exit(0);
426
427} 425}
428#endif 426#endif
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/namei.c b/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
index 14d48fb72..18244613c 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/namei.c
@@ -202,4 +202,3 @@ errcode_t ext2fs_follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
202 ext2fs_free_mem(&buf); 202 ext2fs_free_mem(&buf);
203 return retval; 203 return retval;
204} 204}
205
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/newdir.c b/e2fsprogs/old_e2fsprogs/ext2fs/newdir.c
index 9470e7f56..9f156626d 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/newdir.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/newdir.c
@@ -66,7 +66,6 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
66 dir->name_len = 2 | filetype; 66 dir->name_len = 2 | filetype;
67 dir->name[0] = '.'; 67 dir->name[0] = '.';
68 dir->name[1] = '.'; 68 dir->name[1] = '.';
69
70 } 69 }
71 *block = buf; 70 *block = buf;
72 return 0; 71 return 0;
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/read_bb.c b/e2fsprogs/old_e2fsprogs/ext2fs/read_bb.c
index 4766157c2..ce77bc9f6 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/read_bb.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/read_bb.c
@@ -94,5 +94,3 @@ errcode_t ext2fs_read_bb_inode(ext2_filsys fs, ext2_badblocks_list *bb_list)
94 94
95 return rb.err; 95 return rb.err;
96} 96}
97
98
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/read_bb_file.c b/e2fsprogs/old_e2fsprogs/ext2fs/read_bb_file.c
index 831adcc3a..bf1fc328b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/read_bb_file.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/read_bb_file.c
@@ -94,5 +94,3 @@ errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f,
94 return ext2fs_read_bb_FILE2(fs, f, bb_list, (void *) invalid, 94 return ext2fs_read_bb_FILE2(fs, f, bb_list, (void *) invalid,
95 call_compat_invalid); 95 call_compat_invalid);
96} 96}
97
98
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c b/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c
index 3c550d511..403463a90 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c
@@ -218,4 +218,3 @@ out_free:
218 ext2fs_free_mem((void *)&dindir_buf); 218 ext2fs_free_mem((void *)&dindir_buf);
219 return retval; 219 return retval;
220} 220}
221
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/rs_bitmap.c b/e2fsprogs/old_e2fsprogs/ext2fs/rs_bitmap.c
index e932b3c9d..32e87b77a 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/rs_bitmap.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/rs_bitmap.c
@@ -104,4 +104,3 @@ errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
104 bmap->magic = EXT2_ET_MAGIC_BLOCK_BITMAP; 104 bmap->magic = EXT2_ET_MAGIC_BLOCK_BITMAP;
105 return retval; 105 return retval;
106} 106}
107
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c b/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c
index 0ae0a8234..b618acc5b 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/rw_bitmaps.c
@@ -293,4 +293,3 @@ errcode_t ext2fs_write_bitmaps(ext2_filsys fs)
293 } 293 }
294 return 0; 294 return 0;
295} 295}
296
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/swapfs.c b/e2fsprogs/old_e2fsprogs/ext2fs/swapfs.c
index 2fca3cfbb..07b757abd 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/swapfs.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/swapfs.c
@@ -66,7 +66,6 @@ void ext2fs_swap_super(struct ext2_super_block * sb)
66 sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]); 66 sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]);
67 for (i=0; i < 17; i++) 67 for (i=0; i < 17; i++)
68 sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]); 68 sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]);
69
70} 69}
71 70
72void ext2fs_swap_group_desc(struct ext2_group_desc *gdp) 71void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
@@ -222,7 +221,6 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
222 ext2fs_swap_ext_attr((char *) (eat + 1), (char *) (eaf + 1), 221 ext2fs_swap_ext_attr((char *) (eat + 1), (char *) (eaf + 1),
223 bufsize - sizeof(struct ext2_inode) - 222 bufsize - sizeof(struct ext2_inode) -
224 t->i_extra_isize - sizeof(__u32), 0); 223 t->i_extra_isize - sizeof(__u32), 0);
225
226} 224}
227 225
228void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t, 226void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/unlink.c b/e2fsprogs/old_e2fsprogs/ext2fs/unlink.c
index 83ac2713e..71a9ffcb9 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/unlink.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/unlink.c
@@ -97,4 +97,3 @@ errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir,
97 97
98 return (ls.done) ? 0 : EXT2_ET_DIR_NO_SPACE; 98 return (ls.done) ? 0 : EXT2_ET_DIR_NO_SPACE;
99} 99}
100
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
index 64cca05a7..0829f5686 100644
--- a/e2fsprogs/old_e2fsprogs/util.c
+++ b/e2fsprogs/old_e2fsprogs/util.c
@@ -95,7 +95,6 @@ force_check:
95 bb_error_msg("%s is apparently in use by the system", device); 95 bb_error_msg("%s is apparently in use by the system", device);
96 goto force_check; 96 goto force_check;
97 } 97 }
98
99} 98}
100 99
101void parse_journal_opts(char **journal_device, int *journal_flags, 100void parse_journal_opts(char **journal_device, int *journal_flags,