diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1999-06-25 15:40:18 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1999-06-25 15:40:18 +0000 |
| commit | e72a9ba39471364ad2f9397f645ca547090e3485 (patch) | |
| tree | fc07169d8ee1172f9cdaa73659de726c8eb1b5da /e2fsck/swapfs.c | |
| parent | b41d360bf5a9a7b3456ce60e5c2a86fcd292a043 (diff) | |
| download | e2fsprogs-e72a9ba39471364ad2f9397f645ca547090e3485.tar.gz | |
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass4.c, swapfs.c:
e2fsck.h:
pass1.c (pass1_get_blocks, pass1_read_inode, pass1_write_inode,
pass1_check_directory, e2fsck_use_inode_shortcuts): Make pass1_* be
private static functions, and create new function
e2fsck_use_inode_shortcuts which sets and clears the inode shortcut
functions in the fs structure.
e2fsck.h:
pass2.c (e2fsck_process_bad_inode): Make process_bad_inode() an
exported function.
pass4.c (e2fsck_pass4): Call e2fsck_process_bad_inode to check if a
disconnected inode has any problems before connecting it to
/lost+found. Bug and suggested fix by Pavel Machek <pavel@bug.ucw.cz>
ChangeLog, swapfs.c:
swapfs.c (ext2fs_swap_inode): Add compatibility for Linux 2.3 kernels
that use i_generation instead of i_version. Patch supplied by Jon
Bright <sircus@sircus.demon.co.uk>.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Fix typo in man page which caused the badblocks command
to not show up in the "SEE ALSO" section.
ChangeLog, expect.1, expect.2, image.gz, name:
f_recnect_bad: New test which checks the case where a disconnect inode
also bad inode fields; we need to make sure e2fsck offers to fix the
inode (or clear the inode, as necessary).
Diffstat (limited to 'e2fsck/swapfs.c')
| -rw-r--r-- | e2fsck/swapfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/e2fsck/swapfs.c b/e2fsck/swapfs.c index 605b8e3c..3a8a8786 100644 --- a/e2fsck/swapfs.c +++ b/e2fsck/swapfs.c @@ -114,8 +114,7 @@ static void swap_inodes(e2fsck_t ctx) errcode_t retval; struct ext2_inode * inode; - fs->read_inode = pass1_read_inode; - fs->get_blocks = pass1_get_blocks; + e2fsck_use_inode_shortcuts(ctx, 1); retval = ext2fs_get_mem(fs->blocksize * fs->inode_blocks_per_group, (void **) &buf); @@ -179,8 +178,7 @@ static void swap_inodes(e2fsck_t ctx) } ext2fs_free_mem((void **) &buf); ext2fs_free_mem((void **) &block_buf); - fs->read_inode = 0; - fs->get_blocks = 0; + e2fsck_use_inode_shortcuts(ctx, 0); } void swap_filesys(e2fsck_t ctx) |