mirror of
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
synced 2025-01-19 15:03:24 +08:00
ChangeLog, bmove.c, icount.c, inode.c, llseek.c:
llseek.c (ext2fs_llseek): Fix type error for ext2fs_llseek() icount.c (ext2fs_icount_validate): bmove.c (process_block): Fix lint error in type for fprintf(). inode.c (ext2fs_check_directory): Add support for the callback to return the error code EXT2_ET_CALLBACK_NOTHANDLED. ChangeLog, mke2fs.c: Make parse_raid_opts return a void, to fix a -Wall warning.
This commit is contained in:
parent
00e5433eb5
commit
d163b09487
@ -1,3 +1,15 @@
|
||||
Fri Oct 3 13:35:59 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
||||
|
||||
* llseek.c (ext2fs_llseek): Fix type error for ext2fs_llseek()
|
||||
|
||||
* icount.c (ext2fs_icount_validate):
|
||||
* bmove.c (process_block): Fix lint error in type for fprintf().
|
||||
|
||||
Mon Sep 15 11:45:09 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
||||
|
||||
* inode.c (ext2fs_check_directory): Add support for the callback
|
||||
to return the error code EXT2_ET_CALLBACK_NOTHANDLED.
|
||||
|
||||
Thu Sep 4 12:28:22 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
||||
|
||||
* bitmaps.c (ext2fs_set_bitmap_padding): New function which sets the
|
||||
|
@ -72,7 +72,7 @@ static int process_block(ext2_filsys fs, blk_t *block_nr,
|
||||
ext2fs_mark_block_bitmap(pb->alloc_map, block);
|
||||
ret = BLOCK_CHANGED;
|
||||
if (pb->flags & EXT2_BMOVE_DEBUG)
|
||||
printf("ino=%ld, blockcnt=%d, %ld->%ld\n", pb->ino,
|
||||
printf("ino=%ld, blockcnt=%d, %d->%d\n", pb->ino,
|
||||
blockcnt, orig, block);
|
||||
}
|
||||
if (pb->add_dir) {
|
||||
|
@ -286,7 +286,7 @@ errcode_t ext2fs_icount_validate(ext2_icount_t icount, FILE *out)
|
||||
}
|
||||
for (i=1; i < icount->count; i++) {
|
||||
if (icount->list[i-1].ino >= icount->list[i].ino) {
|
||||
fprintf(out, "%s: list[%d].ino=%u, list[%d].ino=%u\n",
|
||||
fprintf(out, "%s: list[%d].ino=%ld, list[%d].ino=%ld\n",
|
||||
bad, i-1, icount->list[i-1].ino,
|
||||
i, icount->list[i].ino);
|
||||
ret = EINVAL;
|
||||
|
@ -84,7 +84,7 @@ errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
|
||||
{
|
||||
ext2_inode_scan scan;
|
||||
errcode_t retval;
|
||||
errcode_t (*save_get_blocks)(ext2_filsys fs, ino_t ino, blk_t *blocks);
|
||||
errcode_t (*save_get_blocks)(ext2_filsys f, ino_t ino, blk_t *blocks);
|
||||
|
||||
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
|
||||
|
||||
@ -629,8 +629,11 @@ errcode_t ext2fs_check_directory(ext2_filsys fs, ino_t ino)
|
||||
if (ino > fs->super->s_inodes_count)
|
||||
return EXT2_ET_BAD_INODE_NUM;
|
||||
|
||||
if (fs->check_directory)
|
||||
return (fs->check_directory)(fs, ino);
|
||||
if (fs->check_directory) {
|
||||
retval = (fs->check_directory)(fs, ino);
|
||||
if (retval != EXT2_ET_CALLBACK_NOTHANDLED)
|
||||
return retval;
|
||||
}
|
||||
retval = ext2fs_read_inode(fs, ino, &inode);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
@ -106,8 +106,7 @@ ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
|
||||
|
||||
#else /* !linux */
|
||||
|
||||
ext2_loff_t ext2fs_llseek (unsigned int fd, ext2_loff_t offset,
|
||||
unsigned int origin)
|
||||
ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
|
||||
{
|
||||
if ((sizeof(off_t) < sizeof(ext2_loff_t)) &&
|
||||
(offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) {
|
||||
|
@ -1,3 +1,8 @@
|
||||
Fri Oct 3 13:38:45 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
||||
|
||||
* mke2fs.c (parse_raid_opts): Make parse_raid_opts return a void,
|
||||
to fix a -Wall warning.
|
||||
|
||||
Mon Sep 15 22:07:12 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
|
||||
|
||||
* tune2fs.c (main):
|
||||
|
@ -538,7 +538,7 @@ static int set_os(struct ext2_super_block *sb, char *os)
|
||||
|
||||
#define PATH_SET "PATH=/sbin"
|
||||
|
||||
static parse_raid_opts(const char *opts)
|
||||
static void parse_raid_opts(const char *opts)
|
||||
{
|
||||
char *buf, *token, *next, *p, *arg;
|
||||
int len;
|
||||
|
Loading…
Reference in New Issue
Block a user