diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1998-03-30 01:16:26 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1998-03-30 01:16:26 +0000 |
| commit | 17dba281a042d3f8122ef7ce6933035a8eae074a (patch) | |
| tree | 85a4581af70211b94bfc3379cede1e61a1993da0 /e2fsck | |
| parent | bf2602bef6040fb958eea6088667f6203153e95e (diff) | |
| download | e2fsprogs-17dba281a042d3f8122ef7ce6933035a8eae074a.tar.gz | |
ChangeLog, e2fsck.h, pass4.c, super.c:
super.c, e2fsck.h: Always declare e2fsck_get_device_size() as an
extern in e2fsck.h to prevent -Wall warnings.
pass4.c (e2fsck_pass4): Remove unused variable 'j'.
super.c (check_super_block): Fix broken superblock sanity check when
calculating blocks_per_group if s_log_frag_size != s_log_block_size.
Since we don't support fragments, this isn't a bug deal, but it's good
to get it fixed.
ChangeLog, Makefile.elf-lib:
Makefile.elf-lib (installdirs): Change use of DLL_INSTALL_DIR to
ELF_INSTALL_DIR. (Doesn't make a difference currently, but it's
correct this way.)
ChangeLog, fgetversion.c, getversion.c:
getversion.c (getversion): Return 0 if there's no error.
fgetversion.c (fgetversion): Pass the address of the temporary
variable instead of the unitialized variable to the
EXT2_IOC_GETVERSION ioctl.
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/ChangeLog | 14 | ||||
| -rw-r--r-- | e2fsck/e2fsck.h | 1 | ||||
| -rw-r--r-- | e2fsck/pass4.c | 2 | ||||
| -rw-r--r-- | e2fsck/super.c | 6 |
4 files changed, 18 insertions, 5 deletions
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 4d7b72f6..63513a80 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,17 @@ +1998-03-29 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * super.c, e2fsck.h: Always declare e2fsck_get_device_size() as an + extern in e2fsck.h to prevent -Wall warnings. + + * pass4.c (e2fsck_pass4): Remove unused variable 'j'. + +1998-03-28 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * super.c (check_super_block): Fix broken superblock sanity check + when calculating blocks_per_group if s_log_frag_size != + s_log_block_size. Since we don't support fragments, this + isn't a bug deal, but it's good to get it fixed. + 1998-03-23 Theodore Ts'o <tytso@rsts-11.mit.edu> * unix.c: Fix bug in check of feature set, to make sure we can diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index e1c59449..efb7549f 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -261,6 +261,7 @@ extern void ehandler_init(io_channel channel); /* super.c */ void check_super_block(e2fsck_t ctx); +errcode_t e2fsck_get_device_size(e2fsck_t ctx); /* swapfs.c */ void swap_filesys(e2fsck_t ctx); diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c index 1cb7449f..f65785a7 100644 --- a/e2fsck/pass4.c +++ b/e2fsck/pass4.c @@ -85,7 +85,7 @@ void e2fsck_pass4(e2fsck_t ctx) #endif struct problem_context pctx; __u16 link_count, link_counted; - int group, max, j; + int group, max; #ifdef RESOURCE_TRACK init_resource_track(&rtrack); diff --git a/e2fsck/super.c b/e2fsck/super.c index 5c0e54de..62038be5 100644 --- a/e2fsck/super.c +++ b/e2fsck/super.c @@ -62,8 +62,6 @@ errcode_t e2fsck_get_device_size(e2fsck_t ctx) EXT2_BLOCK_SIZE(ctx->fs->super), &ctx->num_blocks)); } -#else -extern errcode_t e2fsck_get_device_size(e2fsck_t ctx); #endif void check_super_block(e2fsck_t ctx) @@ -134,8 +132,8 @@ void check_super_block(e2fsck_t ctx) return; } - should_be = s->s_frags_per_group / - (s->s_log_block_size - s->s_log_frag_size + 1); + should_be = s->s_frags_per_group >> + (s->s_log_block_size - s->s_log_frag_size); if (s->s_blocks_per_group != should_be) { pctx.blk = s->s_blocks_per_group; pctx.blk2 = should_be; |