*: mass cosmetic removal of extra empty lines. no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-07-26 01:06:14 +02:00
parent ccb9771861
commit f3ea792bad
53 changed files with 13 additions and 111 deletions

View File

@@ -517,7 +517,6 @@ static void dict_insert(dict_t *dict, dnode_t *node, const void *key)
}
dict_root(dict)->color = dnode_black;
}
/*
@@ -801,7 +800,6 @@ static void e2fsck_add_dx_dir(e2fsck_t ctx, ext2_ino_t ino, int num_blocks)
dir->dx_block = e2fsck_allocate_memory(ctx, num_blocks
* sizeof (struct dx_dirblock_info),
"dx_block info array");
}
/*
@@ -1724,7 +1722,6 @@ errout:
ext2fs_free_mem(&j_inode);
ext2fs_free_mem(&journal);
return retval;
}
static errcode_t e2fsck_journal_fix_bad_inode(e2fsck_t ctx,
@@ -3375,7 +3372,6 @@ static void e2fsck_pass1(e2fsck_t ctx)
e2fsck_write_inode(ctx, ino, inode,
"pass1");
}
}
/*
* If dtime is set, offer to clear it. mke2fs
@@ -3678,7 +3674,6 @@ endit:
ext2fs_free_mem(&block_buf);
ext2fs_free_mem(&inode);
}
/*
@@ -4451,8 +4446,7 @@ static void mark_table_blocks(e2fsck_t ctx)
ctx->invalid_bitmaps++;
}
} else {
ext2fs_mark_block_bitmap(ctx->block_found_map,
b);
ext2fs_mark_block_bitmap(ctx->block_found_map, b);
}
}
}
@@ -4469,10 +4463,9 @@ static void mark_table_blocks(e2fsck_t ctx)
ctx->invalid_bitmaps++;
}
} else {
ext2fs_mark_block_bitmap(ctx->block_found_map,
fs->group_desc[i].bg_block_bitmap);
}
ext2fs_mark_block_bitmap(ctx->block_found_map,
fs->group_desc[i].bg_block_bitmap);
}
}
/*
* Mark block used for the inode bitmap
@@ -4486,8 +4479,8 @@ static void mark_table_blocks(e2fsck_t ctx)
ctx->invalid_bitmaps++;
}
} else {
ext2fs_mark_block_bitmap(ctx->block_found_map,
fs->group_desc[i].bg_inode_bitmap);
ext2fs_mark_block_bitmap(ctx->block_found_map,
fs->group_desc[i].bg_inode_bitmap);
}
}
block += fs->super->s_blocks_per_group;
@@ -5588,7 +5581,6 @@ static void e2fsck_pass2(e2fsck_t ctx)
ext2fs_mark_super_dirty(fs);
}
}
}
#define MAX_DEPTH 32000
@@ -9748,7 +9740,6 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx)
if (print_answer)
printf("%s.\n", answer ?
_(preen_msg[(int) ptr->prompt]) : _("IGNORED"));
}
if ((ptr->prompt == PROMPT_ABORT) && answer)
@@ -11324,7 +11315,7 @@ static int release_inode_block(ext2_filsys fs, blk_t *block_nr,
if ((blk < fs->super->s_first_data_block) ||
(blk >= fs->super->s_blocks_count)) {
fix_problem(ctx, PR_0_ORPHAN_ILLEGAL_BLOCK_NUM, pctx);
return_abort:
return_abort:
pb->abort = 1;
return BLOCK_ABORT;
}
@@ -11537,7 +11528,7 @@ static int release_orphan_inodes(e2fsck_t ctx)
}
ext2fs_free_mem(&block_buf);
return 0;
return_abort:
return_abort:
ext2fs_free_mem(&block_buf);
return 1;
}
@@ -11618,7 +11609,7 @@ static void check_resize_inode(e2fsck_t ctx)
!(inode.i_mode & LINUX_S_IFREG) ||
(blk < fs->super->s_first_data_block ||
blk >= fs->super->s_blocks_count)) {
resize_inode_invalid:
resize_inode_invalid:
if (fix_problem(ctx, PR_0_RESIZE_INODE_INVALID, &pctx)) {
memset(&inode, 0, sizeof(inode));
e2fsck_write_inode(ctx, EXT2_RESIZE_INO, &inode,
@@ -11660,10 +11651,9 @@ static void check_resize_inode(e2fsck_t ctx)
}
}
cleanup:
cleanup:
ext2fs_free_mem(&dind_buf);
}
}
static void check_super_block(e2fsck_t ctx)
{
@@ -11842,7 +11832,6 @@ static void check_super_block(e2fsck_t ctx)
(gd->bg_free_inodes_count > sb->s_inodes_per_group) ||
(gd->bg_used_dirs_count > sb->s_inodes_per_group))
ext2fs_unmark_valid(fs);
}
/*
@@ -11902,7 +11891,6 @@ static void check_super_block(e2fsck_t ctx)
fs->super->s_feature_incompat &=
~EXT2_FEATURE_INCOMPAT_FILETYPE;
ext2fs_mark_super_dirty(fs);
}
}

View File

@@ -171,4 +171,3 @@ errcode_t ext2fs_get_free_blocks(ext2_filsys fs, blk_t start, blk_t finish,
} while (b != finish);
return EXT2_ET_BLOCK_ALLOC_FAIL;
}

View File

@@ -97,12 +97,9 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
fs->group_desc[group].bg_inode_table = new_blk;
}
return 0;
}
errcode_t ext2fs_allocate_tables(ext2_filsys fs)
{
errcode_t retval;
@@ -115,4 +112,3 @@ errcode_t ext2fs_allocate_tables(ext2_filsys fs)
}
return 0;
}

View File

@@ -260,9 +260,3 @@ static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
*block_nr = blk;
return BLOCK_CHANGED;
}

View File

@@ -88,4 +88,3 @@ void ext2fs_warn_bitmap2(ext2fs_generic_bitmap bitmap,
bb_error_msg("#%lu", arg);
#endif
}

View File

@@ -435,4 +435,3 @@ errcode_t ext2fs_block_iterate(ext2_filsys fs,
return ext2fs_block_iterate2(fs, ino, BLOCK_FLAG_NO_LARGE | flags,
block_buf, xlate_func, &xl);
}

View File

@@ -259,6 +259,3 @@ done:
}
return retval;
}

View File

@@ -153,4 +153,3 @@ errcode_t ext2fs_move_blocks(ext2_filsys fs,
}
return 0;
}

View File

@@ -84,4 +84,3 @@ errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
#define ext2fs_brel_move(brel, old, new) ((brel)->move((brel), old, new))
#define ext2fs_brel_delete(brel, old) ((brel)->delete((brel), old))
#define ext2fs_brel_free(brel) ((brel)->free((brel)))

View File

@@ -378,4 +378,3 @@ errcode_t ext2fs_close(ext2_filsys fs)
ext2fs_free(fs);
return 0;
}

View File

@@ -70,4 +70,3 @@ errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
return 0;
}

View File

@@ -217,4 +217,3 @@ next:
return BLOCK_ABORT;
return 0;
}

View File

@@ -130,4 +130,3 @@ errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
{
return ext2fs_write_dir_block2(fs, block, inbuf, 0);
}

View File

@@ -92,6 +92,4 @@ errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest)
errout:
ext2fs_free(fs);
return retval;
}

View File

@@ -37,16 +37,3 @@ struct ext2_image_hdr {
__u32 offset_blockmap; /* Byte offset of the inode bitmaps */
__u32 offset_reserved[8];
};

View File

@@ -50,4 +50,3 @@ struct ext2_ext_attr_entry {
sizeof(struct ext2_xattr_entry)) & ~EXT2_EXT_ATTR_ROUND)
#define EXT2_XATTR_SIZE(size) \
(((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND)

View File

@@ -85,5 +85,3 @@ extern int ext2fs_process_dir_block(ext2_filsys fs,
blk_t ref_block,
int ref_offset,
void *priv_data);

View File

@@ -125,4 +125,3 @@ void ext2fs_free_dblist(ext2_dblist dblist)
dblist->magic = 0;
ext2fs_free_mem(&dblist);
}

View File

@@ -153,5 +153,4 @@ errcode_t ext2fs_get_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino,
retval = ext2fs_get_pathname_int(fs, dir, ino, 32, buf, name);
ext2fs_free_mem(&buf);
return retval;
}

View File

@@ -67,5 +67,3 @@ errcode_t ext2fs_write_ind_block(ext2_filsys fs, blk_t blk, void *buf)
#endif
return io_channel_write_blk(fs->io, blk, 1, buf);
}

View File

@@ -30,4 +30,3 @@
#include "ext2_fs.h"
#define INCLUDE_INLINE_FUNCS
#include "ext2fs.h"

View File

@@ -764,4 +764,3 @@ errcode_t ext2fs_check_directory(ext2_filsys fs, ext2_ino_t ino)
return EXT2_ET_NO_DIRECTORY;
return 0;
}

View File

@@ -268,4 +268,3 @@ static errcode_t inode_flush(io_channel channel)
return ext2fs_file_flush(data->file);
}

View File

@@ -60,6 +60,4 @@ typedef struct journal_superblock_s
/* Dynamic information describing the current state of the log */
__u32 s_sequence; /* first commit ID expected in log */
__u32 s_start; /* blocknr of start of log */
} journal_superblock_t;

View File

@@ -66,5 +66,3 @@ errcode_t ext2fs_lookup(ext2_filsys fs, ext2_ino_t dir, const char *name,
return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND;
}

View File

@@ -136,7 +136,4 @@ errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum,
cleanup:
ext2fs_free_mem(&block);
return retval;
}

View File

@@ -188,7 +188,6 @@ static int mkjournal_proc(ext2_filsys fs,
return (BLOCK_CHANGED | BLOCK_ABORT);
else
return BLOCK_CHANGED;
}
/*
@@ -423,6 +422,5 @@ main(int argc, char **argv)
}
ext2fs_close(fs);
exit(0);
}
#endif

View File

@@ -202,4 +202,3 @@ errcode_t ext2fs_follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
ext2fs_free_mem(&buf);
return retval;
}

View File

@@ -66,7 +66,6 @@ errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
dir->name_len = 2 | filetype;
dir->name[0] = '.';
dir->name[1] = '.';
}
*block = buf;
return 0;

View File

@@ -94,5 +94,3 @@ errcode_t ext2fs_read_bb_inode(ext2_filsys fs, ext2_badblocks_list *bb_list)
return rb.err;
}

View File

@@ -94,5 +94,3 @@ errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f,
return ext2fs_read_bb_FILE2(fs, f, bb_list, (void *) invalid,
call_compat_invalid);
}

View File

@@ -218,4 +218,3 @@ out_free:
ext2fs_free_mem((void *)&dindir_buf);
return retval;
}

View File

@@ -104,4 +104,3 @@ errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
bmap->magic = EXT2_ET_MAGIC_BLOCK_BITMAP;
return retval;
}

View File

@@ -293,4 +293,3 @@ errcode_t ext2fs_write_bitmaps(ext2_filsys fs)
}
return 0;
}

View File

@@ -66,7 +66,6 @@ void ext2fs_swap_super(struct ext2_super_block * sb)
sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]);
for (i=0; i < 17; i++)
sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]);
}
void 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,
ext2fs_swap_ext_attr((char *) (eat + 1), (char *) (eaf + 1),
bufsize - sizeof(struct ext2_inode) -
t->i_extra_isize - sizeof(__u32), 0);
}
void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,

View File

@@ -97,4 +97,3 @@ errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir,
return (ls.done) ? 0 : EXT2_ET_DIR_NO_SPACE;
}

View File

@@ -95,7 +95,6 @@ force_check:
bb_error_msg("%s is apparently in use by the system", device);
goto force_check;
}
}
void parse_journal_opts(char **journal_device, int *journal_flags,