1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* pass1.c -- pass #1 of e2fsck: sequential scan of the inode table
|
2008-08-28 07:07:54 +04:00
|
|
|
*
|
1997-04-29 20:15:03 +04:00
|
|
|
* Copyright (C) 1993, 1994, 1995, 1996, 1997 Theodore Ts'o.
|
|
|
|
*
|
|
|
|
* %Begin-Header%
|
|
|
|
* This file may be redistributed under the terms of the GNU Public
|
|
|
|
* License.
|
|
|
|
* %End-Header%
|
2008-08-28 07:07:54 +04:00
|
|
|
*
|
1997-04-26 17:21:57 +04:00
|
|
|
* Pass 1 of e2fsck iterates over all the inodes in the filesystems,
|
|
|
|
* and applies the following tests to each inode:
|
|
|
|
*
|
|
|
|
* - The mode field of the inode must be legal.
|
|
|
|
* - The size and block count fields of the inode are correct.
|
|
|
|
* - A data block must not be used by another inode
|
|
|
|
*
|
|
|
|
* Pass 1 also gathers the collects the following information:
|
|
|
|
*
|
|
|
|
* - A bitmap of which inodes are in use. (inode_used_map)
|
|
|
|
* - A bitmap of which inodes are directories. (inode_dir_map)
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
* - A bitmap of which inodes are regular files. (inode_reg_map)
|
1997-04-26 17:21:57 +04:00
|
|
|
* - A bitmap of which inodes have bad fields. (inode_bad_map)
|
1997-04-29 20:15:03 +04:00
|
|
|
* - A bitmap of which inodes are in bad blocks. (inode_bb_map)
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
* - A bitmap of which inodes are imagic inodes. (inode_imagic_map)
|
1997-04-26 17:21:57 +04:00
|
|
|
* - A bitmap of which blocks are in use. (block_found_map)
|
|
|
|
* - A bitmap of which blocks are in use by two inodes (block_dup_map)
|
|
|
|
* - The data blocks of the directory inodes. (dir_map)
|
|
|
|
*
|
|
|
|
* Pass 1 is designed to stash away enough information so that the
|
|
|
|
* other passes should not need to read in the inode information
|
|
|
|
* during the normal course of a filesystem check. (Althogh if an
|
|
|
|
* inconsistency is detected, other passes may need to read in an
|
|
|
|
* inode to fix it.)
|
|
|
|
*
|
|
|
|
* Note that pass 1B will be invoked if there are any duplicate blocks
|
|
|
|
* found.
|
|
|
|
*/
|
|
|
|
|
2003-12-28 15:04:35 +03:00
|
|
|
#define _GNU_SOURCE 1 /* get strnlen() */
|
2011-09-19 01:34:37 +04:00
|
|
|
#include "config.h"
|
2002-10-14 07:56:28 +04:00
|
|
|
#include <string.h>
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <time.h>
|
1997-04-26 17:58:21 +04:00
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
#include "e2fsck.h"
|
2001-07-02 19:54:09 +04:00
|
|
|
#include <ext2fs/ext2_ext_attr.h>
|
|
|
|
|
1997-04-29 20:15:03 +04:00
|
|
|
#include "problem.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
#ifdef NO_INLINE_FUNCS
|
|
|
|
#define _INLINE_
|
|
|
|
#else
|
|
|
|
#define _INLINE_ inline
|
|
|
|
#endif
|
|
|
|
|
2010-06-14 01:00:00 +04:00
|
|
|
static int process_block(ext2_filsys fs, blk64_t *blocknr,
|
|
|
|
e2_blkcnt_t blockcnt, blk64_t ref_blk,
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
int ref_offset, void *priv_data);
|
2010-06-14 01:00:00 +04:00
|
|
|
static int process_bad_block(ext2_filsys fs, blk64_t *block_nr,
|
|
|
|
e2_blkcnt_t blockcnt, blk64_t ref_blk,
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
int ref_offset, void *priv_data);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
|
1997-04-26 17:21:57 +04:00
|
|
|
char *block_buf);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void mark_table_blocks(e2fsck_t ctx);
|
|
|
|
static void alloc_bb_map(e2fsck_t ctx);
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
static void alloc_imagic_map(e2fsck_t ctx);
|
2001-06-02 08:26:26 +04:00
|
|
|
static void mark_inode_bad(e2fsck_t ctx, ino_t ino);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void handle_fs_bad_blocks(e2fsck_t ctx);
|
|
|
|
static void process_inodes(e2fsck_t ctx, char *block_buf);
|
1998-04-30 21:35:59 +04:00
|
|
|
static EXT2_QSORT_TYPE process_inode_cmp(const void *a, const void *b);
|
1997-04-26 17:34:30 +04:00
|
|
|
static errcode_t scan_callback(ext2_filsys fs, ext2_inode_scan scan,
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
dgrp_t group, void * priv_data);
|
2008-08-28 07:07:54 +04:00
|
|
|
static void adjust_extattr_refcount(e2fsck_t ctx, ext2_refcount_t refcount,
|
2001-07-07 19:12:50 +04:00
|
|
|
char *block_buf, int adjust_sign);
|
2010-06-14 01:00:00 +04:00
|
|
|
/* static char *describe_illegal_block(ext2_filsys fs, blk64_t block); */
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
struct process_block_struct {
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
ext2_ino_t ino;
|
2004-03-30 06:17:14 +04:00
|
|
|
unsigned is_dir:1, is_reg:1, clear:1, suppress:1,
|
2003-11-21 18:41:58 +03:00
|
|
|
fragmented:1, compressed:1, bbcheck:1;
|
e2fsck: make block counting variable in pass1 64 bits
Justin reported that creating a 4T file with posix_fallocate led
to fsck errors:
e2fsck 1.41.10 (10-Feb-2009)
Pass 1: Checking inodes, blocks, and sizes
Inode 12, i_blocks is 8589935432, should be 840. Fix? yes
This looks like a 32-bit overflow.
commmit 8a8f36540bbf5d4397cf476e216e9a720b5c1d8e added handling of
the high i_blocks number, but we accumulate blocks in the num_blocks
field, and that's still just 32 bits.
Note: we don't need to expand max_blocks for now, that's only used
in the non-extents case, and those files have smaller max sizes.
I haven't been able to replicate the problem, oddly, but Justin
reports that this patch fixed his situation.
Reported-by: Justin Maggard <jmaggard10@gmail.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
2010-03-30 20:42:51 +04:00
|
|
|
blk64_t num_blocks;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t max_blocks;
|
1998-06-11 00:45:22 +04:00
|
|
|
e2_blkcnt_t last_block;
|
2009-11-28 17:35:37 +03:00
|
|
|
e2_blkcnt_t last_db_block;
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
int num_illegal_blocks;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t previous_block;
|
1997-04-26 17:34:30 +04:00
|
|
|
struct ext2_inode *inode;
|
1997-04-29 20:15:03 +04:00
|
|
|
struct problem_context *pctx;
|
2003-11-21 18:41:58 +03:00
|
|
|
ext2fs_block_bitmap fs_meta_blocks;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
e2fsck_t ctx;
|
1997-04-26 17:21:57 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
struct process_inode_block {
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
ext2_ino_t ino;
|
1997-04-26 17:21:57 +04:00
|
|
|
struct ext2_inode inode;
|
|
|
|
};
|
|
|
|
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
struct scan_callback_struct {
|
|
|
|
e2fsck_t ctx;
|
|
|
|
char *block_buf;
|
|
|
|
};
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* For the inodes to process list.
|
|
|
|
*/
|
|
|
|
static struct process_inode_block *inodes_to_process;
|
|
|
|
static int process_inode_count;
|
|
|
|
|
2002-05-18 07:37:42 +04:00
|
|
|
static __u64 ext2_max_sizes[EXT2_MAX_BLOCK_LOG_SIZE -
|
|
|
|
EXT2_MIN_BLOCK_LOG_SIZE + 1];
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
/*
|
|
|
|
* Free all memory allocated by pass1 in preparation for restarting
|
|
|
|
* things.
|
|
|
|
*/
|
2003-12-07 09:28:50 +03:00
|
|
|
static void unwind_pass1(ext2_filsys fs EXT2FS_ATTR((unused)))
|
1997-04-26 17:34:30 +04:00
|
|
|
{
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&inodes_to_process);
|
1997-11-03 22:42:40 +03:00
|
|
|
inodes_to_process = 0;
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
|
|
|
|
1997-08-14 21:17:16 +04:00
|
|
|
/*
|
|
|
|
* Check to make sure a device inode is real. Returns 1 if the device
|
|
|
|
* checks out, 0 if not.
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
*
|
|
|
|
* Note: this routine is now also used to check FIFO's and Sockets,
|
|
|
|
* since they have the same requirement; the i_block fields should be
|
2008-08-28 07:07:54 +04:00
|
|
|
* zero.
|
1997-08-14 21:17:16 +04:00
|
|
|
*/
|
2008-08-28 07:07:54 +04:00
|
|
|
int e2fsck_pass1_check_device_inode(ext2_filsys fs EXT2FS_ATTR((unused)),
|
2007-05-23 04:53:01 +04:00
|
|
|
struct ext2_inode *inode)
|
1997-08-14 21:17:16 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2001-08-13 14:15:36 +04:00
|
|
|
/*
|
2007-04-01 02:56:09 +04:00
|
|
|
* If the index flag is set, then this is a bogus
|
|
|
|
* device/fifo/socket
|
2001-08-13 14:15:36 +04:00
|
|
|
*/
|
2007-04-01 02:56:09 +04:00
|
|
|
if (inode->i_flags & EXT2_INDEX_FL)
|
2001-08-27 20:18:16 +04:00
|
|
|
return 0;
|
2002-05-21 17:14:17 +04:00
|
|
|
|
1997-11-24 14:51:17 +03:00
|
|
|
/*
|
|
|
|
* We should be able to do the test below all the time, but
|
|
|
|
* because the kernel doesn't forcibly clear the device
|
|
|
|
* inode's additional i_block fields, there are some rare
|
|
|
|
* occasions when a legitimate device inode will have non-zero
|
|
|
|
* additional i_block fields. So for now, we only complain
|
|
|
|
* when the immutable flag is set, which should never happen
|
|
|
|
* for devices. (And that's when the problem is caused, since
|
|
|
|
* you can't set or clear immutable flags for devices.) Once
|
|
|
|
* the kernel has been fixed we can change this...
|
|
|
|
*/
|
2000-04-03 17:57:21 +04:00
|
|
|
if (inode->i_flags & (EXT2_IMMUTABLE_FL | EXT2_APPEND_FL)) {
|
2008-08-28 07:07:54 +04:00
|
|
|
for (i=4; i < EXT2_N_BLOCKS; i++)
|
1997-11-24 14:51:17 +03:00
|
|
|
if (inode->i_block[i])
|
|
|
|
return 0;
|
|
|
|
}
|
1997-08-14 21:17:16 +04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2001-08-04 10:51:18 +04:00
|
|
|
/*
|
|
|
|
* Check to make sure a symlink inode is real. Returns 1 if the symlink
|
|
|
|
* checks out, 0 if not.
|
|
|
|
*/
|
2008-03-14 06:05:00 +03:00
|
|
|
int e2fsck_pass1_check_symlink(ext2_filsys fs, ext2_ino_t ino,
|
|
|
|
struct ext2_inode *inode, char *buf)
|
2001-08-04 10:51:18 +04:00
|
|
|
{
|
2003-12-07 09:28:50 +03:00
|
|
|
unsigned int len;
|
2001-08-05 04:39:39 +04:00
|
|
|
int i;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blocks;
|
2008-03-14 06:05:00 +03:00
|
|
|
ext2_extent_handle_t handle;
|
|
|
|
struct ext2_extent_info info;
|
|
|
|
struct ext2fs_extent extent;
|
2001-08-04 10:51:18 +04:00
|
|
|
|
2002-05-21 17:14:17 +04:00
|
|
|
if ((inode->i_size_high || inode->i_size == 0) ||
|
|
|
|
(inode->i_flags & EXT2_INDEX_FL))
|
2001-08-04 10:51:18 +04:00
|
|
|
return 0;
|
|
|
|
|
2008-03-14 06:05:00 +03:00
|
|
|
if (inode->i_flags & EXT4_EXTENTS_FL) {
|
|
|
|
if (inode->i_size > fs->blocksize)
|
|
|
|
return 0;
|
2009-05-20 00:34:12 +04:00
|
|
|
if (ext2fs_extent_open2(fs, ino, inode, &handle))
|
2008-03-14 06:05:00 +03:00
|
|
|
return 0;
|
|
|
|
i = 0;
|
|
|
|
if (ext2fs_extent_get_info(handle, &info) ||
|
|
|
|
(info.num_entries != 1) ||
|
|
|
|
(info.max_depth != 0))
|
|
|
|
goto exit_extent;
|
|
|
|
if (ext2fs_extent_get(handle, EXT2_EXTENT_ROOT, &extent) ||
|
|
|
|
(extent.e_lblk != 0) ||
|
|
|
|
(extent.e_len != 1) ||
|
|
|
|
(extent.e_pblk < fs->super->s_first_data_block) ||
|
2009-09-08 04:46:34 +04:00
|
|
|
(extent.e_pblk >= ext2fs_blocks_count(fs->super)))
|
2008-03-14 06:05:00 +03:00
|
|
|
goto exit_extent;
|
|
|
|
i = 1;
|
|
|
|
exit_extent:
|
|
|
|
ext2fs_extent_free(handle);
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2010-06-14 01:00:00 +04:00
|
|
|
blocks = ext2fs_inode_data_blocks2(fs, inode);
|
2002-08-17 18:19:44 +04:00
|
|
|
if (blocks) {
|
2002-05-18 23:16:30 +04:00
|
|
|
if ((inode->i_size >= fs->blocksize) ||
|
2002-08-17 18:19:44 +04:00
|
|
|
(blocks != fs->blocksize >> 9) ||
|
2001-08-05 04:39:39 +04:00
|
|
|
(inode->i_block[0] < fs->super->s_first_data_block) ||
|
2009-09-08 04:46:34 +04:00
|
|
|
(inode->i_block[0] >= ext2fs_blocks_count(fs->super)))
|
2001-08-04 10:51:18 +04:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (i = 1; i < EXT2_N_BLOCKS; i++)
|
|
|
|
if (inode->i_block[i])
|
|
|
|
return 0;
|
2002-05-18 23:16:30 +04:00
|
|
|
|
2009-09-08 05:14:24 +04:00
|
|
|
if (io_channel_read_blk64(fs->io, inode->i_block[0], 1, buf))
|
2002-05-18 23:16:30 +04:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
len = strnlen(buf, fs->blocksize);
|
|
|
|
if (len == fs->blocksize)
|
|
|
|
return 0;
|
2001-08-04 10:51:18 +04:00
|
|
|
} else {
|
2002-05-18 23:16:30 +04:00
|
|
|
if (inode->i_size >= sizeof(inode->i_block))
|
2001-08-04 10:51:18 +04:00
|
|
|
return 0;
|
|
|
|
|
2002-05-18 23:16:30 +04:00
|
|
|
len = strnlen((char *)inode->i_block, sizeof(inode->i_block));
|
|
|
|
if (len == sizeof(inode->i_block))
|
2001-08-04 10:51:18 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2002-05-18 23:16:30 +04:00
|
|
|
if (len != inode->i_size)
|
|
|
|
return 0;
|
2001-08-04 10:51:18 +04:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
/*
|
2000-04-03 17:57:21 +04:00
|
|
|
* If the immutable (or append-only) flag is set on the inode, offer
|
|
|
|
* to clear it.
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
*/
|
2002-05-21 17:14:17 +04:00
|
|
|
#define BAD_SPECIAL_FLAGS (EXT2_IMMUTABLE_FL | EXT2_APPEND_FL)
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
static void check_immutable(e2fsck_t ctx, struct problem_context *pctx)
|
|
|
|
{
|
2002-05-18 23:16:30 +04:00
|
|
|
if (!(pctx->inode->i_flags & BAD_SPECIAL_FLAGS))
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (!fix_problem(ctx, PR_1_SET_IMMUTABLE, pctx))
|
|
|
|
return;
|
|
|
|
|
2002-05-18 23:16:30 +04:00
|
|
|
pctx->inode->i_flags &= ~BAD_SPECIAL_FLAGS;
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
e2fsck_write_inode(ctx, pctx->ino, pctx->inode, "pass1");
|
|
|
|
}
|
|
|
|
|
2000-05-27 18:40:09 +04:00
|
|
|
/*
|
|
|
|
* If device, fifo or socket, check size is zero -- if not offer to
|
|
|
|
* clear it
|
|
|
|
*/
|
|
|
|
static void check_size(e2fsck_t ctx, struct problem_context *pctx)
|
|
|
|
{
|
|
|
|
struct ext2_inode *inode = pctx->inode;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2011-07-09 03:54:57 +04:00
|
|
|
if (EXT2_I_SIZE(inode) == 0)
|
2000-05-27 18:40:09 +04:00
|
|
|
return;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2001-08-13 14:11:39 +04:00
|
|
|
if (!fix_problem(ctx, PR_1_SET_NONZSIZE, pctx))
|
2000-05-27 18:40:09 +04:00
|
|
|
return;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2000-05-27 18:40:09 +04:00
|
|
|
inode->i_size = 0;
|
2001-06-02 08:26:26 +04:00
|
|
|
inode->i_size_high = 0;
|
2000-05-27 18:40:09 +04:00
|
|
|
e2fsck_write_inode(ctx, pctx->ino, pctx->inode, "pass1");
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2005-03-21 21:15:45 +03:00
|
|
|
static void check_ea_in_inode(e2fsck_t ctx, struct problem_context *pctx)
|
|
|
|
{
|
|
|
|
struct ext2_super_block *sb = ctx->fs->super;
|
|
|
|
struct ext2_inode_large *inode;
|
|
|
|
struct ext2_ext_attr_entry *entry;
|
2006-11-15 07:38:17 +03:00
|
|
|
char *start, *end;
|
2007-05-08 09:07:30 +04:00
|
|
|
unsigned int storage_size, remain;
|
2005-03-21 21:15:45 +03:00
|
|
|
int problem = 0;
|
|
|
|
|
|
|
|
inode = (struct ext2_inode_large *) pctx->inode;
|
|
|
|
storage_size = EXT2_INODE_SIZE(ctx->fs->super) - EXT2_GOOD_OLD_INODE_SIZE -
|
|
|
|
inode->i_extra_isize;
|
|
|
|
start = ((char *) inode) + EXT2_GOOD_OLD_INODE_SIZE +
|
|
|
|
inode->i_extra_isize + sizeof(__u32);
|
|
|
|
end = (char *) inode + EXT2_INODE_SIZE(ctx->fs->super);
|
|
|
|
entry = (struct ext2_ext_attr_entry *) start;
|
|
|
|
|
|
|
|
/* scan all entry's headers first */
|
|
|
|
|
|
|
|
/* take finish entry 0UL into account */
|
2008-08-28 07:07:54 +04:00
|
|
|
remain = storage_size - sizeof(__u32);
|
2005-03-21 21:15:45 +03:00
|
|
|
|
|
|
|
while (!EXT2_EXT_IS_LAST_ENTRY(entry)) {
|
2008-02-02 11:16:32 +03:00
|
|
|
__u32 hash;
|
2005-03-21 21:15:45 +03:00
|
|
|
|
|
|
|
/* header eats this space */
|
|
|
|
remain -= sizeof(struct ext2_ext_attr_entry);
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2005-03-21 21:15:45 +03:00
|
|
|
/* is attribute name valid? */
|
|
|
|
if (EXT2_EXT_ATTR_SIZE(entry->e_name_len) > remain) {
|
|
|
|
pctx->num = entry->e_name_len;
|
|
|
|
problem = PR_1_ATTR_NAME_LEN;
|
|
|
|
goto fix;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* attribute len eats this space */
|
|
|
|
remain -= EXT2_EXT_ATTR_SIZE(entry->e_name_len);
|
|
|
|
|
|
|
|
/* check value size */
|
|
|
|
if (entry->e_value_size == 0 || entry->e_value_size > remain) {
|
|
|
|
pctx->num = entry->e_value_size;
|
|
|
|
problem = PR_1_ATTR_VALUE_SIZE;
|
|
|
|
goto fix;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* e_value_block must be 0 in inode's ea */
|
|
|
|
if (entry->e_value_block != 0) {
|
|
|
|
pctx->num = entry->e_value_block;
|
|
|
|
problem = PR_1_ATTR_VALUE_BLOCK;
|
|
|
|
goto fix;
|
|
|
|
}
|
2008-02-02 11:16:32 +03:00
|
|
|
|
|
|
|
hash = ext2fs_ext_attr_hash_entry(entry,
|
|
|
|
start + entry->e_value_offs);
|
|
|
|
|
|
|
|
/* e_hash may be 0 in older inode's ea */
|
|
|
|
if (entry->e_hash != 0 && entry->e_hash != hash) {
|
2005-03-21 21:15:45 +03:00
|
|
|
pctx->num = entry->e_hash;
|
|
|
|
problem = PR_1_ATTR_HASH;
|
|
|
|
goto fix;
|
|
|
|
}
|
|
|
|
|
|
|
|
remain -= entry->e_value_size;
|
|
|
|
|
|
|
|
entry = EXT2_EXT_ATTR_NEXT(entry);
|
|
|
|
}
|
|
|
|
fix:
|
|
|
|
/*
|
|
|
|
* it seems like a corruption. it's very unlikely we could repair
|
|
|
|
* EA(s) in automatic fashion -bzzz
|
|
|
|
*/
|
|
|
|
if (problem == 0 || !fix_problem(ctx, problem, pctx))
|
|
|
|
return;
|
|
|
|
|
2008-02-02 11:16:32 +03:00
|
|
|
/* simply remove all possible EA(s) */
|
2005-03-21 21:15:45 +03:00
|
|
|
*((__u32 *)start) = 0UL;
|
2007-10-20 22:10:26 +04:00
|
|
|
e2fsck_write_inode_full(ctx, pctx->ino, pctx->inode,
|
2005-03-21 21:15:45 +03:00
|
|
|
EXT2_INODE_SIZE(sb), "pass1");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void check_inode_extra_space(e2fsck_t ctx, struct problem_context *pctx)
|
|
|
|
{
|
|
|
|
struct ext2_super_block *sb = ctx->fs->super;
|
|
|
|
struct ext2_inode_large *inode;
|
|
|
|
__u32 *eamagic;
|
|
|
|
int min, max;
|
|
|
|
|
|
|
|
inode = (struct ext2_inode_large *) pctx->inode;
|
|
|
|
if (EXT2_INODE_SIZE(sb) == EXT2_GOOD_OLD_INODE_SIZE) {
|
|
|
|
/* this isn't large inode. so, nothing to check */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
printf("inode #%u, i_extra_size %d\n", pctx->ino,
|
|
|
|
inode->i_extra_isize);
|
2008-08-28 07:07:54 +04:00
|
|
|
#endif
|
2011-09-15 18:38:55 +04:00
|
|
|
/* i_extra_isize must cover i_extra_isize + i_checksum_hi at least */
|
|
|
|
min = sizeof(inode->i_extra_isize) + sizeof(inode->i_checksum_hi);
|
2005-03-21 21:15:45 +03:00
|
|
|
max = EXT2_INODE_SIZE(sb) - EXT2_GOOD_OLD_INODE_SIZE;
|
2008-08-28 07:07:54 +04:00
|
|
|
/*
|
2005-03-21 21:15:45 +03:00
|
|
|
* For now we will allow i_extra_isize to be 0, but really
|
|
|
|
* implementations should never allow i_extra_isize to be 0
|
|
|
|
*/
|
|
|
|
if (inode->i_extra_isize &&
|
|
|
|
(inode->i_extra_isize < min || inode->i_extra_isize > max)) {
|
|
|
|
if (!fix_problem(ctx, PR_1_EXTRA_ISIZE, pctx))
|
|
|
|
return;
|
|
|
|
inode->i_extra_isize = min;
|
|
|
|
e2fsck_write_inode_full(ctx, pctx->ino, pctx->inode,
|
|
|
|
EXT2_INODE_SIZE(sb), "pass1");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
eamagic = (__u32 *) (((char *) inode) + EXT2_GOOD_OLD_INODE_SIZE +
|
|
|
|
inode->i_extra_isize);
|
|
|
|
if (*eamagic == EXT2_EXT_ATTR_MAGIC) {
|
|
|
|
/* it seems inode has an extended attribute(s) in body */
|
|
|
|
check_ea_in_inode(ctx, pctx);
|
|
|
|
}
|
|
|
|
}
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
|
2008-08-28 07:07:54 +04:00
|
|
|
/*
|
2007-04-02 18:08:59 +04:00
|
|
|
* Check to see if the inode might really be a directory, despite i_mode
|
|
|
|
*
|
|
|
|
* This is a lot of complexity for something for which I'm not really
|
|
|
|
* convinced happens frequently in the wild. If for any reason this
|
|
|
|
* causes any problems, take this code out.
|
|
|
|
* [tytso:20070331.0827EDT]
|
|
|
|
*/
|
|
|
|
static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx,
|
|
|
|
char *buf)
|
|
|
|
{
|
|
|
|
struct ext2_inode *inode = pctx->inode;
|
|
|
|
struct ext2_dir_entry *dirent;
|
2007-04-14 17:29:02 +04:00
|
|
|
errcode_t retval;
|
2011-06-11 18:58:25 +04:00
|
|
|
blk64_t blk;
|
2008-11-16 18:03:00 +03:00
|
|
|
unsigned int i, rec_len, not_device = 0;
|
2010-02-05 18:35:17 +03:00
|
|
|
int extent_fs;
|
2007-04-02 18:08:59 +04:00
|
|
|
|
2010-02-05 18:35:17 +03:00
|
|
|
/*
|
|
|
|
* If the mode looks OK, we believe it. If the first block in
|
|
|
|
* the i_block array is 0, this cannot be a directory. If the
|
|
|
|
* inode is extent-mapped, it is still the case that the latter
|
|
|
|
* cannot be 0 - the magic number in the extent header would make
|
|
|
|
* it nonzero.
|
|
|
|
*/
|
2007-04-02 18:08:59 +04:00
|
|
|
if (LINUX_S_ISDIR(inode->i_mode) || LINUX_S_ISREG(inode->i_mode) ||
|
2007-04-14 20:01:39 +04:00
|
|
|
LINUX_S_ISLNK(inode->i_mode) || inode->i_block[0] == 0)
|
2007-04-02 18:08:59 +04:00
|
|
|
return;
|
|
|
|
|
2010-02-05 18:35:17 +03:00
|
|
|
/*
|
|
|
|
* Check the block numbers in the i_block array for validity:
|
|
|
|
* zero blocks are skipped (but the first one cannot be zero -
|
|
|
|
* see above), other blocks are checked against the first and
|
|
|
|
* max data blocks (from the the superblock) and against the
|
|
|
|
* block bitmap. Any invalid block found means this cannot be
|
|
|
|
* a directory.
|
|
|
|
*
|
|
|
|
* If there are non-zero blocks past the fourth entry, then
|
|
|
|
* this cannot be a device file: we remember that for the next
|
|
|
|
* check.
|
|
|
|
*
|
|
|
|
* For extent mapped files, we don't do any sanity checking:
|
|
|
|
* just try to get the phys block of logical block 0 and run
|
|
|
|
* with it.
|
|
|
|
*/
|
|
|
|
|
2011-06-11 18:58:25 +04:00
|
|
|
extent_fs = (ctx->fs->super->s_feature_incompat &
|
|
|
|
EXT3_FEATURE_INCOMPAT_EXTENTS);
|
2010-02-05 18:35:17 +03:00
|
|
|
if (extent_fs && (inode->i_flags & EXT4_EXTENTS_FL)) {
|
|
|
|
/* extent mapped */
|
2010-06-14 01:00:00 +04:00
|
|
|
if (ext2fs_bmap2(ctx->fs, pctx->ino, inode, 0, 0, 0, 0,
|
2010-02-05 18:35:17 +03:00
|
|
|
&blk))
|
|
|
|
return;
|
|
|
|
/* device files are never extent mapped */
|
|
|
|
not_device++;
|
|
|
|
} else {
|
|
|
|
for (i=0; i < EXT2_N_BLOCKS; i++) {
|
|
|
|
blk = inode->i_block[i];
|
|
|
|
if (!blk)
|
|
|
|
continue;
|
|
|
|
if (i >= 4)
|
|
|
|
not_device++;
|
|
|
|
|
|
|
|
if (blk < ctx->fs->super->s_first_data_block ||
|
2010-02-11 02:20:58 +03:00
|
|
|
blk >= ext2fs_blocks_count(ctx->fs->super) ||
|
|
|
|
ext2fs_fast_test_block_bitmap2(ctx->block_found_map,
|
|
|
|
blk))
|
2010-02-05 18:35:17 +03:00
|
|
|
return; /* Invalid block, can't be dir */
|
|
|
|
}
|
|
|
|
blk = inode->i_block[0];
|
2007-04-02 18:08:59 +04:00
|
|
|
}
|
|
|
|
|
2010-02-05 18:35:17 +03:00
|
|
|
/*
|
|
|
|
* If the mode says this is a device file and the i_links_count field
|
|
|
|
* is sane and we have not ruled it out as a device file previously,
|
|
|
|
* we declare it a device file, not a directory.
|
|
|
|
*/
|
2008-08-28 07:07:54 +04:00
|
|
|
if ((LINUX_S_ISCHR(inode->i_mode) || LINUX_S_ISBLK(inode->i_mode)) &&
|
2007-04-02 18:08:59 +04:00
|
|
|
(inode->i_links_count == 1) && !not_device)
|
|
|
|
return;
|
|
|
|
|
2010-02-05 18:35:17 +03:00
|
|
|
/* read the first block */
|
2011-09-17 00:49:27 +04:00
|
|
|
ehandler_operation(_("reading directory block"));
|
2010-06-14 01:00:00 +04:00
|
|
|
retval = ext2fs_read_dir_block3(ctx->fs, blk, buf, 0);
|
2007-04-14 17:29:02 +04:00
|
|
|
ehandler_operation(0);
|
|
|
|
if (retval)
|
2007-04-02 18:08:59 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
dirent = (struct ext2_dir_entry *) buf;
|
2009-06-22 05:07:38 +04:00
|
|
|
retval = ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
|
|
|
|
if (retval)
|
|
|
|
return;
|
2007-04-02 18:08:59 +04:00
|
|
|
if (((dirent->name_len & 0xFF) != 1) ||
|
|
|
|
(dirent->name[0] != '.') ||
|
|
|
|
(dirent->inode != pctx->ino) ||
|
2008-08-26 05:08:19 +04:00
|
|
|
(rec_len < 12) ||
|
|
|
|
(rec_len % 4) ||
|
|
|
|
(rec_len >= ctx->fs->blocksize - 12))
|
2007-04-02 18:08:59 +04:00
|
|
|
return;
|
|
|
|
|
2008-08-26 05:08:19 +04:00
|
|
|
dirent = (struct ext2_dir_entry *) (buf + rec_len);
|
2009-06-22 05:07:38 +04:00
|
|
|
retval = ext2fs_get_rec_len(ctx->fs, dirent, &rec_len);
|
|
|
|
if (retval)
|
|
|
|
return;
|
2007-04-02 18:08:59 +04:00
|
|
|
if (((dirent->name_len & 0xFF) != 2) ||
|
|
|
|
(dirent->name[0] != '.') ||
|
|
|
|
(dirent->name[1] != '.') ||
|
2008-08-26 05:08:19 +04:00
|
|
|
(rec_len < 12) ||
|
|
|
|
(rec_len % 4))
|
2007-04-02 18:08:59 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (fix_problem(ctx, PR_1_TREAT_AS_DIRECTORY, pctx)) {
|
|
|
|
inode->i_mode = (inode->i_mode & 07777) | LINUX_S_IFDIR;
|
2008-08-28 07:07:54 +04:00
|
|
|
e2fsck_write_inode_full(ctx, pctx->ino, inode,
|
|
|
|
EXT2_INODE_SIZE(ctx->fs->super),
|
2007-04-02 18:08:59 +04:00
|
|
|
"check_is_really_dir");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-28 07:07:54 +04:00
|
|
|
extern void e2fsck_setup_tdb_icount(e2fsck_t ctx, int flags,
|
2007-04-07 02:43:11 +04:00
|
|
|
ext2_icount_t *ret)
|
|
|
|
{
|
2007-05-23 04:53:01 +04:00
|
|
|
unsigned int threshold;
|
2007-04-07 02:43:11 +04:00
|
|
|
ext2_ino_t num_dirs;
|
|
|
|
errcode_t retval;
|
2007-05-23 04:53:01 +04:00
|
|
|
char *tdb_dir;
|
|
|
|
int enable;
|
2007-04-07 02:43:11 +04:00
|
|
|
|
|
|
|
*ret = 0;
|
|
|
|
|
|
|
|
profile_get_string(ctx->profile, "scratch_files", "directory", 0, 0,
|
|
|
|
&tdb_dir);
|
2007-05-23 04:53:01 +04:00
|
|
|
profile_get_uint(ctx->profile, "scratch_files",
|
|
|
|
"numdirs_threshold", 0, 0, &threshold);
|
2007-04-07 02:43:11 +04:00
|
|
|
profile_get_boolean(ctx->profile, "scratch_files",
|
|
|
|
"icount", 0, 1, &enable);
|
|
|
|
|
|
|
|
retval = ext2fs_get_num_dirs(ctx->fs, &num_dirs);
|
|
|
|
if (retval)
|
|
|
|
num_dirs = 1024; /* Guess */
|
|
|
|
|
|
|
|
if (!enable || !tdb_dir || access(tdb_dir, W_OK) ||
|
|
|
|
(threshold && num_dirs <= threshold))
|
|
|
|
return;
|
|
|
|
|
|
|
|
retval = ext2fs_create_icount_tdb(ctx->fs, tdb_dir, flags, ret);
|
|
|
|
if (retval)
|
|
|
|
*ret = 0;
|
|
|
|
}
|
|
|
|
|
1997-11-03 22:42:40 +03:00
|
|
|
void e2fsck_pass1(e2fsck_t ctx)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
1998-06-11 00:45:22 +04:00
|
|
|
int i;
|
2002-05-17 18:53:07 +04:00
|
|
|
__u64 max_sizes;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ext2_filsys fs = ctx->fs;
|
2011-12-17 00:36:40 +04:00
|
|
|
ext2_ino_t ino = 0;
|
2005-03-21 21:15:45 +03:00
|
|
|
struct ext2_inode *inode;
|
1997-04-26 17:21:57 +04:00
|
|
|
ext2_inode_scan scan;
|
|
|
|
char *block_buf;
|
1997-10-20 05:38:32 +04:00
|
|
|
#ifdef RESOURCE_TRACK
|
1997-04-26 17:21:57 +04:00
|
|
|
struct resource_track rtrack;
|
1997-10-20 05:38:32 +04:00
|
|
|
#endif
|
1997-04-29 18:53:37 +04:00
|
|
|
unsigned char frag, fsize;
|
1997-04-29 20:15:03 +04:00
|
|
|
struct problem_context pctx;
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
struct scan_callback_struct scan_struct;
|
2001-01-01 18:51:50 +03:00
|
|
|
struct ext2_super_block *sb = ctx->fs->super;
|
2007-04-14 17:29:02 +04:00
|
|
|
const char *old_op;
|
2007-08-21 05:31:11 +04:00
|
|
|
int imagic_fs, extent_fs;
|
2002-11-01 02:38:55 +03:00
|
|
|
int busted_fs_time = 0;
|
2005-03-21 21:15:45 +03:00
|
|
|
int inode_size;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2007-08-04 04:07:09 +04:00
|
|
|
init_resource_track(&rtrack, ctx->fs->io);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
clear_problem_context(&pctx);
|
|
|
|
|
|
|
|
if (!(ctx->options & E2F_OPT_PREEN))
|
|
|
|
fix_problem(ctx, PR_1_PASS_HEADER, &pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
2002-07-23 20:00:00 +04:00
|
|
|
if ((fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) &&
|
|
|
|
!(ctx->options & E2F_OPT_NO)) {
|
2002-07-20 08:28:07 +04:00
|
|
|
if (ext2fs_u32_list_create(&ctx->dirs_to_hash, 50))
|
|
|
|
ctx->dirs_to_hash = 0;
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
#ifdef MTRACE
|
|
|
|
mtrace_print("Pass 1");
|
|
|
|
#endif
|
|
|
|
|
2002-05-16 13:20:07 +04:00
|
|
|
#define EXT2_BPP(bits) (1ULL << ((bits) - 2))
|
|
|
|
|
|
|
|
for (i = EXT2_MIN_BLOCK_LOG_SIZE; i <= EXT2_MAX_BLOCK_LOG_SIZE; i++) {
|
|
|
|
max_sizes = EXT2_NDIR_BLOCKS + EXT2_BPP(i);
|
|
|
|
max_sizes = max_sizes + EXT2_BPP(i) * EXT2_BPP(i);
|
|
|
|
max_sizes = max_sizes + EXT2_BPP(i) * EXT2_BPP(i) * EXT2_BPP(i);
|
2011-11-26 06:31:09 +04:00
|
|
|
max_sizes = (max_sizes * (1UL << i));
|
2002-05-18 07:37:42 +04:00
|
|
|
ext2_max_sizes[i - EXT2_MIN_BLOCK_LOG_SIZE] = max_sizes;
|
1998-06-11 00:45:22 +04:00
|
|
|
}
|
|
|
|
#undef EXT2_BPP
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
|
|
|
|
imagic_fs = (sb->s_feature_compat & EXT2_FEATURE_COMPAT_IMAGIC_INODES);
|
2007-08-21 05:31:11 +04:00
|
|
|
extent_fs = (sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS);
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Allocate bitmaps structures
|
|
|
|
*/
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
pctx.errcode = ext2fs_allocate_inode_bitmap(fs, _("in-use inode map"),
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
&ctx->inode_used_map);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 1;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_IBITMAP_ERROR, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
pctx.errcode = ext2fs_allocate_inode_bitmap(fs,
|
|
|
|
_("directory inode map"), &ctx->inode_dir_map);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 2;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_IBITMAP_ERROR, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
pctx.errcode = ext2fs_allocate_inode_bitmap(fs,
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
_("regular file inode map"), &ctx->inode_reg_map);
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 6;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_IBITMAP_ERROR, &pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
2011-06-11 02:58:16 +04:00
|
|
|
pctx.errcode = ext2fs_allocate_subcluster_bitmap(fs,
|
|
|
|
_("in-use block map"),
|
|
|
|
&ctx->block_found_map);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 1;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_BBITMAP_ERROR, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2007-04-07 02:43:11 +04:00
|
|
|
e2fsck_setup_tdb_icount(ctx, 0, &ctx->inode_link_info);
|
|
|
|
if (!ctx->inode_link_info)
|
|
|
|
pctx.errcode = ext2fs_create_icount2(fs, 0, 0, 0,
|
|
|
|
&ctx->inode_link_info);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_ICOUNT, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
2005-03-21 21:15:45 +03:00
|
|
|
inode_size = EXT2_INODE_SIZE(fs->super);
|
|
|
|
inode = (struct ext2_inode *)
|
|
|
|
e2fsck_allocate_memory(ctx, inode_size, "scratch inode");
|
|
|
|
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
inodes_to_process = (struct process_inode_block *)
|
|
|
|
e2fsck_allocate_memory(ctx,
|
|
|
|
(ctx->process_inode_size *
|
|
|
|
sizeof(struct process_inode_block)),
|
|
|
|
"array of inodes to process");
|
1997-04-26 17:21:57 +04:00
|
|
|
process_inode_count = 0;
|
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx.errcode = ext2fs_init_dblist(fs, 0);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_DBCOUNT, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
2007-03-28 19:57:20 +04:00
|
|
|
ext2fs_free_mem(&inode);
|
1997-11-03 22:42:40 +03:00
|
|
|
return;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
|
2000-07-04 23:51:22 +04:00
|
|
|
/*
|
|
|
|
* If the last orphan field is set, clear it, since the pass1
|
|
|
|
* processing will automatically find and clear the orphans.
|
|
|
|
* In the future, we may want to try using the last_orphan
|
|
|
|
* linked list ourselves, but for now, we clear it so that the
|
|
|
|
* ext3 mount code won't get confused.
|
|
|
|
*/
|
|
|
|
if (!(ctx->options & E2F_OPT_READONLY)) {
|
|
|
|
if (fs->super->s_last_orphan) {
|
|
|
|
fs->super->s_last_orphan = 0;
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
mark_table_blocks(ctx);
|
2011-06-11 02:58:16 +04:00
|
|
|
pctx.errcode = ext2fs_convert_subcluster_bitmap(fs,
|
|
|
|
&ctx->block_found_map);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_CONVERT_SUBCLUSTER, &pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
ext2fs_free_mem(&inode);
|
|
|
|
return;
|
|
|
|
}
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
block_buf = (char *) e2fsck_allocate_memory(ctx, fs->blocksize * 3,
|
|
|
|
"block interate buffer");
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
e2fsck_use_inode_shortcuts(ctx, 1);
|
2007-04-14 17:29:02 +04:00
|
|
|
old_op = ehandler_operation(_("opening inode scan"));
|
2008-08-28 07:07:54 +04:00
|
|
|
pctx.errcode = ext2fs_open_inode_scan(fs, ctx->inode_buffer_blocks,
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
&scan);
|
2007-04-14 17:29:02 +04:00
|
|
|
ehandler_operation(old_op);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_ISCAN_ERROR, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
2007-03-28 19:57:20 +04:00
|
|
|
ext2fs_free_mem(&block_buf);
|
|
|
|
ext2fs_free_mem(&inode);
|
1997-11-03 22:42:40 +03:00
|
|
|
return;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
1997-04-29 20:15:03 +04:00
|
|
|
ext2fs_inode_scan_flags(scan, EXT2_SF_SKIP_MISSING_ITABLE, 0);
|
2005-03-21 21:15:45 +03:00
|
|
|
ctx->stashed_inode = inode;
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
scan_struct.ctx = ctx;
|
|
|
|
scan_struct.block_buf = block_buf;
|
|
|
|
ext2fs_set_inode_callback(scan, scan_callback, &scan_struct);
|
|
|
|
if (ctx->progress)
|
1998-02-24 23:22:23 +03:00
|
|
|
if ((ctx->progress)(ctx, 1, 0, ctx->fs->group_desc_count))
|
|
|
|
return;
|
2005-04-06 22:55:53 +04:00
|
|
|
if ((fs->super->s_wtime < fs->super->s_inodes_count) ||
|
|
|
|
(fs->super->s_mtime < fs->super->s_inodes_count))
|
2002-11-01 02:38:55 +03:00
|
|
|
busted_fs_time = 1;
|
|
|
|
|
2011-09-24 21:48:55 +04:00
|
|
|
if ((fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_MMP) &&
|
|
|
|
!(fs->super->s_mmp_block <= fs->super->s_first_data_block ||
|
|
|
|
fs->super->s_mmp_block >= fs->super->s_blocks_count))
|
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map,
|
|
|
|
fs->super->s_mmp_block);
|
|
|
|
|
2002-10-03 09:09:35 +04:00
|
|
|
while (1) {
|
2011-09-24 21:48:55 +04:00
|
|
|
if (ino % (fs->super->s_inodes_per_group * 4) == 1) {
|
|
|
|
if (e2fsck_mmp_update(fs))
|
|
|
|
fatal_error(ctx, 0);
|
|
|
|
}
|
2007-04-14 17:29:02 +04:00
|
|
|
old_op = ehandler_operation(_("getting next inode from scan"));
|
2008-08-28 07:07:54 +04:00
|
|
|
pctx.errcode = ext2fs_get_next_inode_full(scan, &ino,
|
2005-03-21 21:15:45 +03:00
|
|
|
inode, inode_size);
|
2007-04-14 17:29:02 +04:00
|
|
|
ehandler_operation(old_op);
|
2002-10-03 09:09:35 +04:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
|
|
|
return;
|
|
|
|
if (pctx.errcode == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE) {
|
|
|
|
if (!ctx->inode_bb_map)
|
|
|
|
alloc_bb_map(ctx);
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_bb_map, ino);
|
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
|
2002-10-03 09:09:35 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_ISCAN_ERROR, &pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!ino)
|
|
|
|
break;
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx.ino = ino;
|
2005-03-21 21:15:45 +03:00
|
|
|
pctx.inode = inode;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->stashed_ino = ino;
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_links_count) {
|
2008-08-28 07:07:54 +04:00
|
|
|
pctx.errcode = ext2fs_icount_store(ctx->inode_link_info,
|
2005-03-21 21:15:45 +03:00
|
|
|
ino, inode->i_links_count);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
2005-03-21 21:15:45 +03:00
|
|
|
pctx.num = inode->i_links_count;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
fix_problem(ctx, PR_1_ICOUNT_STORE, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
}
|
|
|
|
}
|
2008-04-01 23:18:44 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Test for incorrect extent flag settings.
|
|
|
|
*
|
|
|
|
* On big-endian machines we must be careful:
|
|
|
|
* When the inode is read, the i_block array is not swapped
|
|
|
|
* if the extent flag is set. Therefore if we are testing
|
|
|
|
* for or fixing a wrongly-set flag, we must potentially
|
|
|
|
* (un)swap before testing, or after fixing.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In this case the extents flag was set when read, so
|
|
|
|
* extent_header_verify is ok. If the inode is cleared,
|
|
|
|
* no need to swap... so no extra swapping here.
|
|
|
|
*/
|
2008-08-28 07:07:54 +04:00
|
|
|
if ((inode->i_flags & EXT4_EXTENTS_FL) && !extent_fs &&
|
2007-08-21 05:31:11 +04:00
|
|
|
(inode->i_links_count || (ino == EXT2_BAD_INO) ||
|
|
|
|
(ino == EXT2_ROOT_INO) || (ino == EXT2_JOURNAL_INO))) {
|
2008-08-28 07:07:54 +04:00
|
|
|
if ((ext2fs_extent_header_verify(inode->i_block,
|
2007-08-21 05:31:11 +04:00
|
|
|
sizeof(inode->i_block)) == 0) &&
|
|
|
|
fix_problem(ctx, PR_1_EXTENT_FEATURE, &pctx)) {
|
|
|
|
sb->s_feature_incompat |= EXT3_FEATURE_INCOMPAT_EXTENTS;
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
|
|
|
extent_fs = 1;
|
|
|
|
} else if (fix_problem(ctx, PR_1_EXTENTS_SET, &pctx)) {
|
|
|
|
clear_inode:
|
|
|
|
e2fsck_clear_inode(ctx, ino, inode, 0, "pass1");
|
|
|
|
if (ino == EXT2_BAD_INO)
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map,
|
2007-08-21 05:31:11 +04:00
|
|
|
ino);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-04-01 23:18:44 +04:00
|
|
|
/*
|
|
|
|
* For big-endian machines:
|
|
|
|
* If the inode didn't have the extents flag set when it
|
|
|
|
* was read, then the i_blocks array was swapped. To test
|
|
|
|
* as an extents header, we must swap it back first.
|
|
|
|
* IF we then set the extents flag, the entire i_block
|
|
|
|
* array must be un/re-swapped to make it proper extents data.
|
|
|
|
*/
|
2007-08-21 05:31:11 +04:00
|
|
|
if (extent_fs && !(inode->i_flags & EXT4_EXTENTS_FL) &&
|
|
|
|
(inode->i_links_count || (ino == EXT2_BAD_INO) ||
|
|
|
|
(ino == EXT2_ROOT_INO) || (ino == EXT2_JOURNAL_INO)) &&
|
|
|
|
(LINUX_S_ISREG(inode->i_mode) ||
|
2008-04-01 23:18:44 +04:00
|
|
|
LINUX_S_ISDIR(inode->i_mode))) {
|
|
|
|
void *ehp;
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
__u32 tmp_block[EXT2_N_BLOCKS];
|
|
|
|
|
|
|
|
for (i = 0; i < EXT2_N_BLOCKS; i++)
|
|
|
|
tmp_block[i] = ext2fs_swab32(inode->i_block[i]);
|
|
|
|
ehp = tmp_block;
|
|
|
|
#else
|
|
|
|
ehp = inode->i_block;
|
|
|
|
#endif
|
2008-08-28 07:07:54 +04:00
|
|
|
if ((ext2fs_extent_header_verify(ehp,
|
2008-04-01 23:18:44 +04:00
|
|
|
sizeof(inode->i_block)) == 0) &&
|
|
|
|
(fix_problem(ctx, PR_1_UNSET_EXTENT_FL, &pctx))) {
|
2007-08-21 05:31:11 +04:00
|
|
|
inode->i_flags |= EXT4_EXTENTS_FL;
|
2008-04-01 23:18:44 +04:00
|
|
|
#ifdef WORDS_BIGENDIAN
|
2008-08-28 07:07:54 +04:00
|
|
|
memcpy(inode->i_block, tmp_block,
|
2008-04-01 23:18:44 +04:00
|
|
|
sizeof(inode->i_block));
|
|
|
|
#endif
|
2007-08-21 05:31:11 +04:00
|
|
|
e2fsck_write_inode(ctx, ino, inode, "pass1");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
if (ino == EXT2_BAD_INO) {
|
|
|
|
struct process_block_struct pb;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2011-09-28 23:12:55 +04:00
|
|
|
if ((inode->i_mode || inode->i_uid || inode->i_gid ||
|
|
|
|
inode->i_links_count || inode->i_file_acl) &&
|
|
|
|
fix_problem(ctx, PR_1_INVALID_BAD_INODE, &pctx)) {
|
|
|
|
memset(inode, 0, sizeof(struct ext2_inode));
|
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
|
|
|
"clear bad inode");
|
|
|
|
}
|
|
|
|
|
2003-11-21 18:41:58 +03:00
|
|
|
pctx.errcode = ext2fs_copy_bitmap(ctx->block_found_map,
|
|
|
|
&pb.fs_meta_blocks);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 4;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_BBITMAP_ERROR, &pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
pb.ino = EXT2_BAD_INO;
|
|
|
|
pb.num_blocks = pb.last_block = 0;
|
2009-11-28 17:35:37 +03:00
|
|
|
pb.last_db_block = -1;
|
1997-04-26 17:34:30 +04:00
|
|
|
pb.num_illegal_blocks = 0;
|
1997-04-29 20:15:03 +04:00
|
|
|
pb.suppress = 0; pb.clear = 0; pb.is_dir = 0;
|
2003-11-21 18:41:58 +03:00
|
|
|
pb.is_reg = 0; pb.fragmented = 0; pb.bbcheck = 0;
|
2005-03-21 21:15:45 +03:00
|
|
|
pb.inode = inode;
|
1997-04-29 20:15:03 +04:00
|
|
|
pb.pctx = &pctx;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pb.ctx = ctx;
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx.errcode = ext2fs_block_iterate3(fs, ino, 0,
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
block_buf, process_bad_block, &pb);
|
2003-11-21 18:41:58 +03:00
|
|
|
ext2fs_free_block_bitmap(pb.fs_meta_blocks);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_BLOCK_ITERATE, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
}
|
2003-11-21 18:41:58 +03:00
|
|
|
if (pb.bbcheck)
|
|
|
|
if (!fix_problem(ctx, PR_1_BBINODE_BAD_METABLOCK_PROMPT, &pctx)) {
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
|
1997-04-29 20:15:03 +04:00
|
|
|
clear_problem_context(&pctx);
|
2002-10-03 09:09:35 +04:00
|
|
|
continue;
|
2001-01-13 00:53:25 +03:00
|
|
|
} else if (ino == EXT2_ROOT_INO) {
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Make sure the root inode is a directory; if
|
|
|
|
* not, offer to clear it. It will be
|
|
|
|
* regnerated in pass #3.
|
|
|
|
*/
|
2005-03-21 21:15:45 +03:00
|
|
|
if (!LINUX_S_ISDIR(inode->i_mode)) {
|
2007-08-21 05:31:11 +04:00
|
|
|
if (fix_problem(ctx, PR_1_ROOT_NO_DIR, &pctx))
|
|
|
|
goto clear_inode;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If dtime is set, offer to clear it. mke2fs
|
|
|
|
* version 0.2b created filesystems with the
|
|
|
|
* dtime field set for the root and lost+found
|
|
|
|
* directories. We won't worry about
|
|
|
|
* /lost+found, since that can be regenerated
|
|
|
|
* easily. But we will fix the root directory
|
|
|
|
* as a special case.
|
|
|
|
*/
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_dtime && inode->i_links_count) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_ROOT_DTIME, &pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_dtime = 0;
|
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
1997-04-26 17:34:30 +04:00
|
|
|
"pass1");
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2001-01-13 00:53:25 +03:00
|
|
|
} else if (ino == EXT2_JOURNAL_INO) {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
|
2001-01-03 19:57:24 +03:00
|
|
|
if (fs->super->s_journal_inum == EXT2_JOURNAL_INO) {
|
2005-03-21 21:15:45 +03:00
|
|
|
if (!LINUX_S_ISREG(inode->i_mode) &&
|
2001-01-13 00:53:25 +03:00
|
|
|
fix_problem(ctx, PR_1_JOURNAL_BAD_MODE,
|
|
|
|
&pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_mode = LINUX_S_IFREG;
|
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
2001-01-13 00:53:25 +03:00
|
|
|
"pass1");
|
|
|
|
}
|
2001-01-03 19:57:24 +03:00
|
|
|
check_blocks(ctx, &pctx, block_buf);
|
2002-10-03 09:09:35 +04:00
|
|
|
continue;
|
2001-01-03 19:57:24 +03:00
|
|
|
}
|
2010-06-14 01:00:00 +04:00
|
|
|
if ((inode->i_links_count ||
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_blocks || inode->i_block[0]) &&
|
2008-08-28 07:07:54 +04:00
|
|
|
fix_problem(ctx, PR_1_JOURNAL_INODE_NOT_CLEAR,
|
2001-01-03 19:57:24 +03:00
|
|
|
&pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
memset(inode, 0, inode_size);
|
2001-01-13 00:53:25 +03:00
|
|
|
ext2fs_icount_store(ctx->inode_link_info,
|
|
|
|
ino, 0);
|
2008-08-28 07:07:54 +04:00
|
|
|
e2fsck_write_inode_full(ctx, ino, inode,
|
2005-03-21 21:15:45 +03:00
|
|
|
inode_size, "pass1");
|
2001-01-03 19:57:24 +03:00
|
|
|
}
|
2011-07-20 22:40:06 +04:00
|
|
|
} else if ((ino == EXT4_USR_QUOTA_INO) ||
|
|
|
|
(ino == EXT4_GRP_QUOTA_INO)) {
|
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
|
|
|
|
if ((fs->super->s_feature_ro_compat &
|
|
|
|
EXT4_FEATURE_RO_COMPAT_QUOTA) &&
|
|
|
|
(fs->super->s_usr_quota_inum == ino) ||
|
|
|
|
(fs->super->s_grp_quota_inum == ino)) {
|
|
|
|
if (!LINUX_S_ISREG(inode->i_mode) &&
|
|
|
|
fix_problem(ctx, PR_1_QUOTA_BAD_MODE,
|
|
|
|
&pctx)) {
|
|
|
|
inode->i_mode = LINUX_S_IFREG;
|
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
|
|
|
"pass1");
|
|
|
|
}
|
|
|
|
check_blocks(ctx, &pctx, block_buf);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ((inode->i_links_count ||
|
|
|
|
inode->i_blocks || inode->i_block[0]) &&
|
|
|
|
fix_problem(ctx, PR_1_QUOTA_INODE_NOT_CLEAR,
|
|
|
|
&pctx)) {
|
|
|
|
memset(inode, 0, inode_size);
|
|
|
|
ext2fs_icount_store(ctx->inode_link_info,
|
|
|
|
ino, 0);
|
|
|
|
e2fsck_write_inode_full(ctx, ino, inode,
|
|
|
|
inode_size, "pass1");
|
|
|
|
}
|
2001-01-13 00:53:25 +03:00
|
|
|
} else if (ino < EXT2_FIRST_INODE(fs->super)) {
|
2000-10-25 01:16:09 +04:00
|
|
|
int problem = 0;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
|
2001-01-06 08:55:58 +03:00
|
|
|
if (ino == EXT2_BOOT_LOADER_INO) {
|
2005-03-21 21:15:45 +03:00
|
|
|
if (LINUX_S_ISDIR(inode->i_mode))
|
2000-10-25 01:16:09 +04:00
|
|
|
problem = PR_1_RESERVED_BAD_MODE;
|
2001-08-31 00:42:09 +04:00
|
|
|
} else if (ino == EXT2_RESIZE_INO) {
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_mode &&
|
|
|
|
!LINUX_S_ISREG(inode->i_mode))
|
2001-08-31 00:42:09 +04:00
|
|
|
problem = PR_1_RESERVED_BAD_MODE;
|
2001-01-06 08:55:58 +03:00
|
|
|
} else {
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_mode != 0)
|
2000-10-25 01:16:09 +04:00
|
|
|
problem = PR_1_RESERVED_BAD_MODE;
|
|
|
|
}
|
|
|
|
if (problem) {
|
|
|
|
if (fix_problem(ctx, problem, &pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_mode = 0;
|
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
1997-04-26 17:58:21 +04:00
|
|
|
"pass1");
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
check_blocks(ctx, &pctx, block_buf);
|
2002-10-03 09:09:35 +04:00
|
|
|
continue;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2011-07-20 22:40:06 +04:00
|
|
|
|
ChangeLog, pass1.c, problem.c, problem.h, problemP.h:
pass1.c: Treat inodes with a low dtime (that were from a corrupted
orphan list) specially.
problem.c, problem.h: Add new problem codes PR_1_LOW_DTIME and
PR_1_ORPHAN_LIST_REFUGEES, and a new latch group, PR_LATCH_LOW_DTIME.
problemP.h: Expand the size of the problem flag to be an int instead
of a short. Expand space in the flag word which is reserved for
problem latch flags from 3 bits to 8 bits.
ChangeLog, expect.1, expect.2, image.gz, name:
f_badorphan: New test which verifies corrupted orphan list handling.
2001-05-14 16:47:41 +04:00
|
|
|
/*
|
|
|
|
* Check for inodes who might have been part of the
|
|
|
|
* orphaned list linked list. They should have gotten
|
|
|
|
* dealt with by now, unless the list had somehow been
|
|
|
|
* corrupted.
|
2008-08-28 07:07:54 +04:00
|
|
|
*
|
ChangeLog, pass1.c, problem.c, problem.h, problemP.h:
pass1.c: Treat inodes with a low dtime (that were from a corrupted
orphan list) specially.
problem.c, problem.h: Add new problem codes PR_1_LOW_DTIME and
PR_1_ORPHAN_LIST_REFUGEES, and a new latch group, PR_LATCH_LOW_DTIME.
problemP.h: Expand the size of the problem flag to be an int instead
of a short. Expand space in the flag word which is reserved for
problem latch flags from 3 bits to 8 bits.
ChangeLog, expect.1, expect.2, image.gz, name:
f_badorphan: New test which verifies corrupted orphan list handling.
2001-05-14 16:47:41 +04:00
|
|
|
* FIXME: In the future, inodes which are still in use
|
|
|
|
* (and which are therefore) pending truncation should
|
|
|
|
* be handled specially. Right now we just clear the
|
|
|
|
* dtime field, and the normal e2fsck handling of
|
|
|
|
* inodes where i_size and the inode blocks are
|
|
|
|
* inconsistent is to fix i_size, instead of releasing
|
|
|
|
* the extra blocks. This won't catch the inodes that
|
|
|
|
* was at the end of the orphan list, but it's better
|
|
|
|
* than nothing. The right answer is that there
|
|
|
|
* shouldn't be any bugs in the orphan list handling. :-)
|
|
|
|
*/
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_dtime && !busted_fs_time &&
|
|
|
|
inode->i_dtime < ctx->fs->super->s_inodes_count) {
|
ChangeLog, pass1.c, problem.c, problem.h, problemP.h:
pass1.c: Treat inodes with a low dtime (that were from a corrupted
orphan list) specially.
problem.c, problem.h: Add new problem codes PR_1_LOW_DTIME and
PR_1_ORPHAN_LIST_REFUGEES, and a new latch group, PR_LATCH_LOW_DTIME.
problemP.h: Expand the size of the problem flag to be an int instead
of a short. Expand space in the flag word which is reserved for
problem latch flags from 3 bits to 8 bits.
ChangeLog, expect.1, expect.2, image.gz, name:
f_badorphan: New test which verifies corrupted orphan list handling.
2001-05-14 16:47:41 +04:00
|
|
|
if (fix_problem(ctx, PR_1_LOW_DTIME, &pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_dtime = inode->i_links_count ?
|
2005-04-14 22:07:53 +04:00
|
|
|
0 : ctx->now;
|
2005-03-21 21:15:45 +03:00
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
ChangeLog, pass1.c, problem.c, problem.h, problemP.h:
pass1.c: Treat inodes with a low dtime (that were from a corrupted
orphan list) specially.
problem.c, problem.h: Add new problem codes PR_1_LOW_DTIME and
PR_1_ORPHAN_LIST_REFUGEES, and a new latch group, PR_LATCH_LOW_DTIME.
problemP.h: Expand the size of the problem flag to be an int instead
of a short. Expand space in the flag word which is reserved for
problem latch flags from 3 bits to 8 bits.
ChangeLog, expect.1, expect.2, image.gz, name:
f_badorphan: New test which verifies corrupted orphan list handling.
2001-05-14 16:47:41 +04:00
|
|
|
"pass1");
|
|
|
|
}
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* This code assumes that deleted inodes have
|
2008-08-28 07:07:54 +04:00
|
|
|
* i_links_count set to 0.
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
2005-03-21 21:15:45 +03:00
|
|
|
if (!inode->i_links_count) {
|
|
|
|
if (!inode->i_dtime && inode->i_mode) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx,
|
1997-04-29 20:15:03 +04:00
|
|
|
PR_1_ZERO_DTIME, &pctx)) {
|
2005-04-14 22:07:53 +04:00
|
|
|
inode->i_dtime = ctx->now;
|
2005-03-21 21:15:45 +03:00
|
|
|
e2fsck_write_inode(ctx, ino, inode,
|
1997-04-26 17:34:30 +04:00
|
|
|
"pass1");
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2002-10-03 09:09:35 +04:00
|
|
|
continue;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
/*
|
1997-04-29 18:53:37 +04:00
|
|
|
* n.b. 0.3c ext2fs code didn't clear i_links_count for
|
1997-04-26 17:21:57 +04:00
|
|
|
* deleted files. Oops.
|
1997-04-29 18:53:37 +04:00
|
|
|
*
|
|
|
|
* Since all new ext2 implementations get this right,
|
|
|
|
* we now assume that the case of non-zero
|
|
|
|
* i_links_count and non-zero dtime means that we
|
|
|
|
* should keep the file, not delete it.
|
2008-08-28 07:07:54 +04:00
|
|
|
*
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_dtime) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_SET_DTIME, &pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_dtime = 0;
|
|
|
|
e2fsck_write_inode(ctx, ino, inode, "pass1");
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino);
|
1997-04-29 18:53:37 +04:00
|
|
|
switch (fs->super->s_creator_os) {
|
|
|
|
case EXT2_OS_HURD:
|
2005-03-21 21:15:45 +03:00
|
|
|
frag = inode->osd2.hurd2.h_i_frag;
|
|
|
|
fsize = inode->osd2.hurd2.h_i_fsize;
|
1997-04-29 18:53:37 +04:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
frag = fsize = 0;
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_faddr || frag || fsize ||
|
|
|
|
(LINUX_S_ISDIR(inode->i_mode) && inode->i_dir_acl))
|
2001-06-02 08:26:26 +04:00
|
|
|
mark_inode_bad(ctx, ino);
|
2009-04-24 05:31:16 +04:00
|
|
|
if (!(fs->super->s_feature_incompat &
|
|
|
|
EXT4_FEATURE_INCOMPAT_64BIT) &&
|
|
|
|
inode->osd2.linux2.l_i_file_acl_high != 0)
|
|
|
|
mark_inode_bad(ctx, ino);
|
2006-11-11 14:32:03 +03:00
|
|
|
if ((fs->super->s_creator_os == EXT2_OS_LINUX) &&
|
2008-08-28 07:07:54 +04:00
|
|
|
!(fs->super->s_feature_ro_compat &
|
2006-11-11 14:32:03 +03:00
|
|
|
EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
|
|
|
|
(inode->osd2.linux2.l_i_blocks_hi != 0))
|
|
|
|
mark_inode_bad(ctx, ino);
|
2005-03-21 21:15:45 +03:00
|
|
|
if (inode->i_flags & EXT2_IMAGIC_FL) {
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
if (imagic_fs) {
|
|
|
|
if (!ctx->inode_imagic_map)
|
|
|
|
alloc_imagic_map(ctx);
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_imagic_map,
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
ino);
|
|
|
|
} else {
|
|
|
|
if (fix_problem(ctx, PR_1_SET_IMAGIC, &pctx)) {
|
2005-03-21 21:15:45 +03:00
|
|
|
inode->i_flags &= ~EXT2_IMAGIC_FL;
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
e2fsck_write_inode(ctx, ino,
|
2005-03-21 21:15:45 +03:00
|
|
|
inode, "pass1");
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
}
|
|
|
|
}
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
}
|
2005-03-21 21:15:45 +03:00
|
|
|
|
|
|
|
check_inode_extra_space(ctx, &pctx);
|
2007-04-02 18:08:59 +04:00
|
|
|
check_is_really_dir(ctx, &pctx, block_buf);
|
2005-03-21 21:15:45 +03:00
|
|
|
|
2008-04-01 23:18:44 +04:00
|
|
|
/*
|
2011-10-17 04:29:00 +04:00
|
|
|
* ext2fs_inode_has_valid_blocks2 does not actually look
|
2008-04-01 23:18:44 +04:00
|
|
|
* at i_block[] values, so not endian-sensitive here.
|
|
|
|
*/
|
2008-03-24 15:17:24 +03:00
|
|
|
if (extent_fs && (inode->i_flags & EXT4_EXTENTS_FL) &&
|
|
|
|
LINUX_S_ISLNK(inode->i_mode) &&
|
2011-10-17 04:29:00 +04:00
|
|
|
!ext2fs_inode_has_valid_blocks2(fs, inode) &&
|
2008-03-24 15:17:24 +03:00
|
|
|
fix_problem(ctx, PR_1_FAST_SYMLINK_EXTENT_FL, &pctx)) {
|
|
|
|
inode->i_flags &= ~EXT4_EXTENTS_FL;
|
|
|
|
e2fsck_write_inode(ctx, ino, inode, "pass1");
|
|
|
|
}
|
|
|
|
|
2005-03-21 21:15:45 +03:00
|
|
|
if (LINUX_S_ISDIR(inode->i_mode)) {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_dir_map, ino);
|
1997-11-03 22:42:40 +03:00
|
|
|
e2fsck_add_dir_info(ctx, ino, 0);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_directory_count++;
|
2005-03-21 21:15:45 +03:00
|
|
|
} else if (LINUX_S_ISREG (inode->i_mode)) {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_reg_map, ino);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_regular_count++;
|
2005-03-21 21:15:45 +03:00
|
|
|
} else if (LINUX_S_ISCHR (inode->i_mode) &&
|
|
|
|
e2fsck_pass1_check_device_inode(fs, inode)) {
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
check_immutable(ctx, &pctx);
|
2000-05-27 18:40:09 +04:00
|
|
|
check_size(ctx, &pctx);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_chardev_count++;
|
2005-03-21 21:15:45 +03:00
|
|
|
} else if (LINUX_S_ISBLK (inode->i_mode) &&
|
|
|
|
e2fsck_pass1_check_device_inode(fs, inode)) {
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
check_immutable(ctx, &pctx);
|
2000-05-27 18:40:09 +04:00
|
|
|
check_size(ctx, &pctx);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_blockdev_count++;
|
2005-03-21 21:15:45 +03:00
|
|
|
} else if (LINUX_S_ISLNK (inode->i_mode) &&
|
2008-08-28 07:07:54 +04:00
|
|
|
e2fsck_pass1_check_symlink(fs, ino, inode,
|
2008-03-14 06:05:00 +03:00
|
|
|
block_buf)) {
|
2001-07-28 06:10:01 +04:00
|
|
|
check_immutable(ctx, &pctx);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_symlinks_count++;
|
2005-03-21 21:15:45 +03:00
|
|
|
if (ext2fs_inode_data_blocks(fs, inode) == 0) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_fast_symlinks_count++;
|
2002-08-17 18:19:44 +04:00
|
|
|
check_blocks(ctx, &pctx, block_buf);
|
2002-10-03 09:09:35 +04:00
|
|
|
continue;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2005-03-21 21:15:45 +03:00
|
|
|
else if (LINUX_S_ISFIFO (inode->i_mode) &&
|
|
|
|
e2fsck_pass1_check_device_inode(fs, inode)) {
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
check_immutable(ctx, &pctx);
|
2000-05-27 18:40:09 +04:00
|
|
|
check_size(ctx, &pctx);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_fifo_count++;
|
2005-03-21 21:15:45 +03:00
|
|
|
} else if ((LINUX_S_ISSOCK (inode->i_mode)) &&
|
|
|
|
e2fsck_pass1_check_device_inode(fs, inode)) {
|
ChangeLog, e2fsck.h, pass1.c, pass2.c, pass3.c, problem.c, problem.h, util.c:
pass1.c (e2fsck_pass1): If the filesystem does not support imagic
inodes, if an inode has the imagic flag set, offer to clear the imagic
flag. If a valid device/fifo/socket has the immutable flag set, call
the new helper function check_immutable() to offerto clear the
immutable flag.
pass2.c (check_filetype): Use the new ext2_file_type() helper function
instead of calculating the file_type information manually.
pass3.c (e2fsck_reconnect_file): When adding a link to lost+found,
calculate the filetype information so that ext2fs_link() can use the
information if applicable. (get_lost_and_found): Create the
/lost+found directory with the correct filetype information if
applicable.
util.c (ext2_file_type), e2fsck.h: New function which returns the
directory entry file type information given the inode's mode bits.
problem.c, problem.h: Added new problem codes PR_1_SET_IMAGIC and
PR_1_SET_IMMUTABLE.
ChangeLog, mke2fs.8.in:
mke2fs.8.in: Update manual page so that the sparse_option filesystem
option is properly named.
1999-11-10 16:34:40 +03:00
|
|
|
check_immutable(ctx, &pctx);
|
2000-05-27 18:40:09 +04:00
|
|
|
check_size(ctx, &pctx);
|
|
|
|
ctx->fs_sockets_count++;
|
2001-06-02 08:26:26 +04:00
|
|
|
} else
|
|
|
|
mark_inode_bad(ctx, ino);
|
2008-08-14 17:48:07 +04:00
|
|
|
if (!(inode->i_flags & EXT4_EXTENTS_FL)) {
|
|
|
|
if (inode->i_block[EXT2_IND_BLOCK])
|
|
|
|
ctx->fs_ind_count++;
|
|
|
|
if (inode->i_block[EXT2_DIND_BLOCK])
|
|
|
|
ctx->fs_dind_count++;
|
|
|
|
if (inode->i_block[EXT2_TIND_BLOCK])
|
|
|
|
ctx->fs_tind_count++;
|
|
|
|
}
|
2007-08-21 05:31:11 +04:00
|
|
|
if (!(inode->i_flags & EXT4_EXTENTS_FL) &&
|
|
|
|
(inode->i_block[EXT2_IND_BLOCK] ||
|
|
|
|
inode->i_block[EXT2_DIND_BLOCK] ||
|
|
|
|
inode->i_block[EXT2_TIND_BLOCK] ||
|
2011-10-17 04:29:00 +04:00
|
|
|
ext2fs_file_acl_block(fs, inode))) {
|
1997-04-26 17:21:57 +04:00
|
|
|
inodes_to_process[process_inode_count].ino = ino;
|
2005-03-21 21:15:45 +03:00
|
|
|
inodes_to_process[process_inode_count].inode = *inode;
|
1997-04-26 17:21:57 +04:00
|
|
|
process_inode_count++;
|
1997-04-26 17:34:30 +04:00
|
|
|
} else
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
check_blocks(ctx, &pctx, block_buf);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
1998-02-24 23:22:23 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
1997-11-03 22:42:40 +03:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (process_inode_count >= ctx->process_inode_size) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
process_inodes(ctx, block_buf);
|
1997-11-03 22:42:40 +03:00
|
|
|
|
1998-02-24 23:22:23 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
1997-11-03 22:42:40 +03:00
|
|
|
return;
|
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
process_inodes(ctx, block_buf);
|
1997-04-26 17:21:57 +04:00
|
|
|
ext2fs_close_inode_scan(scan);
|
|
|
|
|
2001-07-07 19:12:50 +04:00
|
|
|
/*
|
|
|
|
* If any extended attribute blocks' reference counts need to
|
|
|
|
* be adjusted, either up (ctx->refcount_extra), or down
|
|
|
|
* (ctx->refcount), then fix them.
|
|
|
|
*/
|
|
|
|
if (ctx->refcount) {
|
|
|
|
adjust_extattr_refcount(ctx, ctx->refcount, block_buf, -1);
|
|
|
|
ea_refcount_free(ctx->refcount);
|
|
|
|
ctx->refcount = 0;
|
|
|
|
}
|
|
|
|
if (ctx->refcount_extra) {
|
|
|
|
adjust_extattr_refcount(ctx, ctx->refcount_extra,
|
|
|
|
block_buf, +1);
|
|
|
|
ea_refcount_free(ctx->refcount_extra);
|
|
|
|
ctx->refcount_extra = 0;
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (ctx->invalid_bitmaps)
|
|
|
|
handle_fs_bad_blocks(ctx);
|
1997-04-26 17:34:30 +04:00
|
|
|
|
2001-07-26 17:02:56 +04:00
|
|
|
/* We don't need the block_ea_map any more */
|
|
|
|
if (ctx->block_ea_map) {
|
|
|
|
ext2fs_free_block_bitmap(ctx->block_ea_map);
|
|
|
|
ctx->block_ea_map = 0;
|
|
|
|
}
|
|
|
|
|
2004-12-24 09:42:22 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_RESIZE_INODE) {
|
|
|
|
ext2fs_block_bitmap save_bmap;
|
|
|
|
|
|
|
|
save_bmap = fs->block_map;
|
|
|
|
fs->block_map = ctx->block_found_map;
|
|
|
|
clear_problem_context(&pctx);
|
|
|
|
pctx.errcode = ext2fs_create_resize_inode(fs);
|
|
|
|
if (pctx.errcode) {
|
2010-05-13 02:58:53 +04:00
|
|
|
if (!fix_problem(ctx, PR_1_RESIZE_INODE_CREATE,
|
|
|
|
&pctx)) {
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pctx.errcode = 0;
|
|
|
|
}
|
|
|
|
if (!pctx.errcode) {
|
|
|
|
e2fsck_read_inode(ctx, EXT2_RESIZE_INO, inode,
|
|
|
|
"recreate inode");
|
|
|
|
inode->i_mtime = ctx->now;
|
|
|
|
e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode,
|
|
|
|
"recreate inode");
|
2004-12-24 09:42:22 +03:00
|
|
|
}
|
|
|
|
fs->block_map = save_bmap;
|
|
|
|
ctx->flags &= ~E2F_FLAG_RESIZE_INODE;
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-11-03 22:42:40 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_RESTART) {
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
/*
|
|
|
|
* Only the master copy of the superblock and block
|
|
|
|
* group descriptors are going to be written during a
|
|
|
|
* restart, so set the superblock to be used to be the
|
|
|
|
* master superblock.
|
|
|
|
*/
|
|
|
|
ctx->use_superblock = 0;
|
1997-04-26 17:34:30 +04:00
|
|
|
unwind_pass1(fs);
|
|
|
|
goto endit;
|
|
|
|
}
|
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (ctx->block_dup_map) {
|
|
|
|
if (ctx->options & E2F_OPT_PREEN) {
|
|
|
|
clear_problem_context(&pctx);
|
|
|
|
fix_problem(ctx, PR_1_DUP_BLOCKS_PREENSTOP, &pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
1997-11-03 22:42:40 +03:00
|
|
|
e2fsck_pass1_dupblocks(ctx, block_buf);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&inodes_to_process);
|
1997-04-26 17:34:30 +04:00
|
|
|
endit:
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
e2fsck_use_inode_shortcuts(ctx, 0);
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&block_buf);
|
2005-03-21 21:15:45 +03:00
|
|
|
ext2fs_free_mem(&inode);
|
1997-04-29 20:15:03 +04:00
|
|
|
|
2009-05-28 17:55:10 +04:00
|
|
|
print_resource_track(ctx, _("Pass 1"), &rtrack, ctx->fs->io);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
/*
|
|
|
|
* When the inode_scan routines call this callback at the end of the
|
|
|
|
* glock group, call process_inodes.
|
|
|
|
*/
|
2008-08-28 07:07:54 +04:00
|
|
|
static errcode_t scan_callback(ext2_filsys fs,
|
2003-12-07 09:28:50 +03:00
|
|
|
ext2_inode_scan scan EXT2FS_ATTR((unused)),
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
dgrp_t group, void * priv_data)
|
1997-04-26 17:34:30 +04:00
|
|
|
{
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
struct scan_callback_struct *scan_struct;
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
e2fsck_t ctx;
|
|
|
|
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
scan_struct = (struct scan_callback_struct *) priv_data;
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
ctx = scan_struct->ctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
process_inodes((e2fsck_t) fs->priv_data, scan_struct->block_buf);
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
|
|
|
|
if (ctx->progress)
|
1998-02-24 23:22:23 +03:00
|
|
|
if ((ctx->progress)(ctx, 1, group+1,
|
|
|
|
ctx->fs->group_desc_count))
|
|
|
|
return EXT2_ET_CANCEL_REQUESTED;
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Process the inodes in the "inodes to process" list.
|
|
|
|
*/
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void process_inodes(e2fsck_t ctx, char *block_buf)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct ext2_inode *old_stashed_inode;
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
ext2_ino_t old_stashed_ino;
|
1997-04-26 17:21:57 +04:00
|
|
|
const char *old_operation;
|
|
|
|
char buf[80];
|
1997-04-29 20:15:03 +04:00
|
|
|
struct problem_context pctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
#if 0
|
1997-04-26 17:34:30 +04:00
|
|
|
printf("begin process_inodes: ");
|
1997-04-26 17:21:57 +04:00
|
|
|
#endif
|
1999-11-23 16:52:48 +03:00
|
|
|
if (process_inode_count == 0)
|
|
|
|
return;
|
1997-04-26 17:21:57 +04:00
|
|
|
old_operation = ehandler_operation(0);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
old_stashed_inode = ctx->stashed_inode;
|
|
|
|
old_stashed_ino = ctx->stashed_ino;
|
1997-04-26 17:21:57 +04:00
|
|
|
qsort(inodes_to_process, process_inode_count,
|
|
|
|
sizeof(struct process_inode_block), process_inode_cmp);
|
1997-04-29 20:15:03 +04:00
|
|
|
clear_problem_context(&pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
for (i=0; i < process_inode_count; i++) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx.inode = ctx->stashed_inode = &inodes_to_process[i].inode;
|
|
|
|
pctx.ino = ctx->stashed_ino = inodes_to_process[i].ino;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
#if 0
|
1997-04-29 20:15:03 +04:00
|
|
|
printf("%u ", pctx.ino);
|
1997-04-26 17:21:57 +04:00
|
|
|
#endif
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
sprintf(buf, _("reading indirect blocks of inode %u"),
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
pctx.ino);
|
1997-04-26 17:21:57 +04:00
|
|
|
ehandler_operation(buf);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
check_blocks(ctx, &pctx, block_buf);
|
1998-02-24 23:22:23 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
1998-02-27 08:03:48 +03:00
|
|
|
break;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->stashed_inode = old_stashed_inode;
|
|
|
|
ctx->stashed_ino = old_stashed_ino;
|
1997-04-26 17:21:57 +04:00
|
|
|
process_inode_count = 0;
|
|
|
|
#if 0
|
1997-04-26 17:34:30 +04:00
|
|
|
printf("end process inodes\n");
|
1997-04-26 17:21:57 +04:00
|
|
|
#endif
|
|
|
|
ehandler_operation(old_operation);
|
|
|
|
}
|
|
|
|
|
1998-04-30 21:35:59 +04:00
|
|
|
static EXT2_QSORT_TYPE process_inode_cmp(const void *a, const void *b)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
|
|
|
const struct process_inode_block *ib_a =
|
|
|
|
(const struct process_inode_block *) a;
|
|
|
|
const struct process_inode_block *ib_b =
|
|
|
|
(const struct process_inode_block *) b;
|
2001-07-08 06:27:40 +04:00
|
|
|
int ret;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2001-07-08 06:27:40 +04:00
|
|
|
ret = (ib_a->inode.i_block[EXT2_IND_BLOCK] -
|
|
|
|
ib_b->inode.i_block[EXT2_IND_BLOCK]);
|
|
|
|
if (ret == 0)
|
2011-10-17 04:29:00 +04:00
|
|
|
/*
|
|
|
|
* We only call process_inodes() for non-extent
|
|
|
|
* inodes, so it's OK to pass NULL to
|
|
|
|
* ext2fs_file_acl_block() here.
|
|
|
|
*/
|
|
|
|
ret = ext2fs_file_acl_block(0, &(ib_a->inode)) -
|
|
|
|
ext2fs_file_acl_block(0, &(ib_b->inode));
|
2008-09-12 17:10:39 +04:00
|
|
|
if (ret == 0)
|
|
|
|
ret = ib_a->ino - ib_b->ino;
|
2001-07-08 06:27:40 +04:00
|
|
|
return ret;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-06-02 08:26:26 +04:00
|
|
|
* Mark an inode as being bad in some what
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
2001-06-02 08:26:26 +04:00
|
|
|
static void mark_inode_bad(e2fsck_t ctx, ino_t ino)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
struct problem_context pctx;
|
2001-06-02 08:26:26 +04:00
|
|
|
|
|
|
|
if (!ctx->inode_bad_map) {
|
|
|
|
clear_problem_context(&pctx);
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2001-06-02 08:26:26 +04:00
|
|
|
pctx.errcode = ext2fs_allocate_inode_bitmap(ctx->fs,
|
|
|
|
_("bad inode map"), &ctx->inode_bad_map);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 3;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_IBITMAP_ERROR, &pctx);
|
|
|
|
/* Should never get here */
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_inode_bitmap2(ctx->inode_bad_map, ino);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
2001-06-02 08:26:26 +04:00
|
|
|
|
1997-04-29 20:15:03 +04:00
|
|
|
/*
|
|
|
|
* This procedure will allocate the inode "bb" (badblock) map table
|
|
|
|
*/
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void alloc_bb_map(e2fsck_t ctx)
|
1997-04-29 20:15:03 +04:00
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
struct problem_context pctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
clear_problem_context(&pctx);
|
|
|
|
pctx.errcode = ext2fs_allocate_inode_bitmap(ctx->fs,
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
_("inode in bad block map"),
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
&ctx->inode_bb_map);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 4;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_IBITMAP_ERROR, &pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
/* Should never get here */
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
/*
|
|
|
|
* This procedure will allocate the inode imagic table
|
|
|
|
*/
|
|
|
|
static void alloc_imagic_map(e2fsck_t ctx)
|
|
|
|
{
|
|
|
|
struct problem_context pctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
clear_problem_context(&pctx);
|
|
|
|
pctx.errcode = ext2fs_allocate_inode_bitmap(ctx->fs,
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
_("imagic inode map"),
|
Many files:
pass4.c (e2fsck_pass4): If an inode is set in the inode_imagic_map
bitmap, don't check to see if it is disconnected from the inode tree
(because it almost certainly will be). Free inode_imagic_map at the
end of pass 4.
pass2.c (check_dir_block, check_filetype): If the FILETYPE feature is
set, check the directory entry's filetype information field, and
fix/set it if necessary. (e2fsck_pass2): Free the inode_reg_map
bitmap at the end of pass 2.
pass1.c (e2fsck_pass1, alloc_imagic_map): Allocate and fill in
information for inode_reg_map and inode_imagic_map, which indicates
which inodes are regular files and AFS inodes, respectively.
Since only the master superblock is written during a restart, force
that superblock to be used after a restart; otherwise changes to the
block group descriptors end up getting ignored.
problem.c, problemP.h: If e2fsck is run -n, make def_yn variable be 0
for "no". Add support for a new flag, PR_NO_NOMSG, which supresses
the problem message if e2fsck is run with the -n option.
problem.c, problem.h (PR_2_SET_FILETYPE, PR_2_BAD_FILETYPE): Add new
problem codes.
message.c (expand_dirent_expression): Add support for %dt which prints
the dirent type information.
e2fsck.c (e2fsck_reset_context): Free new bitmaps (inode_reg_map and
inode_imagic_map).
e2fsck.h (e2fsck_t): Add new inode_reg_map and inode_magic_map to the
context structure.
ChangeLog, nt_io.c:
nt_io.c: New file which supports I/O under Windows NT.
ChangeLog, gen_uuid_nt.c:
gen_uuid_nt.c: New file which creates a UUID under Windows NT.
Many files:
Add support for non-Unix compiles
1999-10-21 23:33:18 +04:00
|
|
|
&ctx->inode_imagic_map);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 5;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_IBITMAP_ERROR, &pctx);
|
|
|
|
/* Should never get here */
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Marks a block as in use, setting the dup_map if it's been set
|
|
|
|
* already. Called by process_block and process_bad_block.
|
1997-04-26 17:58:21 +04:00
|
|
|
*
|
|
|
|
* WARNING: Assumes checks have already been done to make sure block
|
|
|
|
* is valid. This is true in both process_block and process_bad_block.
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
2010-06-14 01:00:00 +04:00
|
|
|
static _INLINE_ void mark_block_used(e2fsck_t ctx, blk64_t block)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
struct problem_context pctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
clear_problem_context(&pctx);
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2009-08-23 06:29:02 +04:00
|
|
|
if (ext2fs_fast_test_block_bitmap2(ctx->block_found_map, block)) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (!ctx->block_dup_map) {
|
|
|
|
pctx.errcode = ext2fs_allocate_block_bitmap(ctx->fs,
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
_("multiply claimed block map"),
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
&ctx->block_dup_map);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = 3;
|
2008-08-28 07:07:54 +04:00
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_BBITMAP_ERROR,
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
&pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
/* Should never get here */
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
}
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_fast_mark_block_bitmap2(ctx->block_dup_map, block);
|
1997-04-26 17:21:57 +04:00
|
|
|
} else {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_fast_mark_block_bitmap2(ctx->block_found_map, block);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-07 19:12:50 +04:00
|
|
|
/*
|
|
|
|
* Adjust the extended attribute block's reference counts at the end
|
|
|
|
* of pass 1, either by subtracting out references for EA blocks that
|
|
|
|
* are still referenced in ctx->refcount, or by adding references for
|
|
|
|
* EA blocks that had extra references as accounted for in
|
|
|
|
* ctx->refcount_extra.
|
|
|
|
*/
|
2008-08-28 07:07:54 +04:00
|
|
|
static void adjust_extattr_refcount(e2fsck_t ctx, ext2_refcount_t refcount,
|
2001-07-07 19:12:50 +04:00
|
|
|
char *block_buf, int adjust_sign)
|
|
|
|
{
|
|
|
|
struct ext2_ext_attr_header *header;
|
|
|
|
struct problem_context pctx;
|
|
|
|
ext2_filsys fs = ctx->fs;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blk;
|
2001-07-07 19:12:50 +04:00
|
|
|
__u32 should_be;
|
|
|
|
int count;
|
|
|
|
|
|
|
|
clear_problem_context(&pctx);
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2001-07-07 19:12:50 +04:00
|
|
|
ea_refcount_intr_begin(refcount);
|
|
|
|
while (1) {
|
|
|
|
if ((blk = ea_refcount_intr_next(refcount, &count)) == 0)
|
|
|
|
break;
|
|
|
|
pctx.blk = blk;
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx.errcode = ext2fs_read_ext_attr2(fs, blk, block_buf);
|
2001-07-07 19:12:50 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1_EXTATTR_READ_ABORT, &pctx);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
header = (struct ext2_ext_attr_header *) block_buf;
|
|
|
|
pctx.blkcount = header->h_refcount;
|
|
|
|
should_be = header->h_refcount + adjust_sign * count;
|
|
|
|
pctx.num = should_be;
|
|
|
|
if (fix_problem(ctx, PR_1_EXTATTR_REFCOUNT, &pctx)) {
|
|
|
|
header->h_refcount = should_be;
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx.errcode = ext2fs_write_ext_attr2(fs, blk,
|
2001-07-07 19:12:50 +04:00
|
|
|
block_buf);
|
|
|
|
if (pctx.errcode) {
|
2010-05-13 02:58:53 +04:00
|
|
|
fix_problem(ctx, PR_1_EXTATTR_WRITE_ABORT,
|
|
|
|
&pctx);
|
2001-07-07 19:12:50 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-02 19:54:09 +04:00
|
|
|
/*
|
|
|
|
* Handle processing the extended attribute blocks
|
|
|
|
*/
|
|
|
|
static int check_ext_attr(e2fsck_t ctx, struct problem_context *pctx,
|
|
|
|
char *block_buf)
|
|
|
|
{
|
|
|
|
ext2_filsys fs = ctx->fs;
|
|
|
|
ext2_ino_t ino = pctx->ino;
|
|
|
|
struct ext2_inode *inode = pctx->inode;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blk;
|
2001-07-20 00:31:25 +04:00
|
|
|
char * end;
|
2001-07-07 19:12:50 +04:00
|
|
|
struct ext2_ext_attr_header *header;
|
2001-07-20 00:31:25 +04:00
|
|
|
struct ext2_ext_attr_entry *entry;
|
2001-07-02 19:54:09 +04:00
|
|
|
int count;
|
2007-04-05 05:42:42 +04:00
|
|
|
region_t region = 0;
|
2007-03-28 19:41:40 +04:00
|
|
|
|
2011-10-17 04:29:00 +04:00
|
|
|
blk = ext2fs_file_acl_block(fs, inode);
|
2001-07-02 19:54:09 +04:00
|
|
|
if (blk == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the Extended attribute flag isn't set, then a non-zero
|
|
|
|
* file acl means that the inode is corrupted.
|
|
|
|
*
|
|
|
|
* Or if the extended attribute block is an invalid block,
|
|
|
|
* then the inode is also corrupted.
|
|
|
|
*/
|
|
|
|
if (!(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR) ||
|
|
|
|
(blk < fs->super->s_first_data_block) ||
|
2009-09-08 04:46:34 +04:00
|
|
|
(blk >= ext2fs_blocks_count(fs->super))) {
|
2001-07-02 19:54:09 +04:00
|
|
|
mark_inode_bad(ctx, ino);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If ea bitmap hasn't been allocated, create it */
|
|
|
|
if (!ctx->block_ea_map) {
|
|
|
|
pctx->errcode = ext2fs_allocate_block_bitmap(fs,
|
|
|
|
_("ext attr block map"),
|
|
|
|
&ctx->block_ea_map);
|
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->num = 2;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_BBITMAP_ERROR, pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create the EA refcount structure if necessary */
|
|
|
|
if (!ctx->refcount) {
|
|
|
|
pctx->errcode = ea_refcount_create(0, &ctx->refcount);
|
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->num = 1;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_REFCOUNT, pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-08 06:27:40 +04:00
|
|
|
#if 0
|
|
|
|
/* Debugging text */
|
|
|
|
printf("Inode %u has EA block %u\n", ino, blk);
|
|
|
|
#endif
|
|
|
|
|
2001-07-02 19:54:09 +04:00
|
|
|
/* Have we seen this EA block before? */
|
2009-08-23 06:29:02 +04:00
|
|
|
if (ext2fs_fast_test_block_bitmap2(ctx->block_ea_map, blk)) {
|
2001-07-02 19:54:09 +04:00
|
|
|
if (ea_refcount_decrement(ctx->refcount, blk, 0) == 0)
|
|
|
|
return 1;
|
|
|
|
/* Ooops, this EA was referenced more than it stated */
|
|
|
|
if (!ctx->refcount_extra) {
|
|
|
|
pctx->errcode = ea_refcount_create(0,
|
|
|
|
&ctx->refcount_extra);
|
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->num = 2;
|
|
|
|
fix_problem(ctx, PR_1_ALLOCATE_REFCOUNT, pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
2001-07-20 00:31:25 +04:00
|
|
|
return 0;
|
2001-07-02 19:54:09 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
ea_refcount_increment(ctx->refcount_extra, blk, 0);
|
|
|
|
return 1;
|
|
|
|
}
|
2007-03-28 19:41:40 +04:00
|
|
|
|
2001-07-02 19:54:09 +04:00
|
|
|
/*
|
|
|
|
* OK, we haven't seen this EA block yet. So we need to
|
|
|
|
* validate it
|
|
|
|
*/
|
|
|
|
pctx->blk = blk;
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_read_ext_attr2(fs, blk, block_buf);
|
2001-07-02 19:54:09 +04:00
|
|
|
if (pctx->errcode && fix_problem(ctx, PR_1_READ_EA_BLOCK, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
header = (struct ext2_ext_attr_header *) block_buf;
|
2011-10-17 04:29:00 +04:00
|
|
|
pctx->blk = ext2fs_file_acl_block(fs, inode);
|
2002-08-17 18:19:44 +04:00
|
|
|
if (((ctx->ext_attr_ver == 1) &&
|
|
|
|
(header->h_magic != EXT2_EXT_ATTR_MAGIC_v1)) ||
|
|
|
|
((ctx->ext_attr_ver == 2) &&
|
|
|
|
(header->h_magic != EXT2_EXT_ATTR_MAGIC))) {
|
|
|
|
if (fix_problem(ctx, PR_1_BAD_EA_BLOCK, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
}
|
2002-05-22 08:22:38 +04:00
|
|
|
|
2001-07-20 00:31:25 +04:00
|
|
|
if (header->h_blocks != 1) {
|
|
|
|
if (fix_problem(ctx, PR_1_EA_MULTI_BLOCK, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
}
|
|
|
|
|
|
|
|
region = region_create(0, fs->blocksize);
|
|
|
|
if (!region) {
|
2010-05-13 02:58:53 +04:00
|
|
|
fix_problem(ctx, PR_1_EA_ALLOC_REGION_ABORT, pctx);
|
2001-07-20 00:31:25 +04:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (region_allocate(region, 0, sizeof(struct ext2_ext_attr_header))) {
|
|
|
|
if (fix_problem(ctx, PR_1_EA_ALLOC_COLLISION, pctx))
|
2001-07-02 19:54:09 +04:00
|
|
|
goto clear_extattr;
|
|
|
|
}
|
2007-03-28 19:41:40 +04:00
|
|
|
|
2001-07-20 00:31:25 +04:00
|
|
|
entry = (struct ext2_ext_attr_entry *)(header+1);
|
|
|
|
end = block_buf + fs->blocksize;
|
|
|
|
while ((char *)entry < end && *(__u32 *)entry) {
|
2008-02-02 11:16:32 +03:00
|
|
|
__u32 hash;
|
|
|
|
|
2001-07-20 00:31:25 +04:00
|
|
|
if (region_allocate(region, (char *)entry - (char *)header,
|
|
|
|
EXT2_EXT_ATTR_LEN(entry->e_name_len))) {
|
|
|
|
if (fix_problem(ctx, PR_1_EA_ALLOC_COLLISION, pctx))
|
|
|
|
goto clear_extattr;
|
2008-02-02 11:16:32 +03:00
|
|
|
break;
|
2001-07-20 00:31:25 +04:00
|
|
|
}
|
2002-08-17 18:19:44 +04:00
|
|
|
if ((ctx->ext_attr_ver == 1 &&
|
2002-05-22 08:22:38 +04:00
|
|
|
(entry->e_name_len == 0 || entry->e_name_index != 0)) ||
|
2002-08-17 18:19:44 +04:00
|
|
|
(ctx->ext_attr_ver == 2 &&
|
2002-05-22 08:22:38 +04:00
|
|
|
entry->e_name_index == 0)) {
|
2001-07-20 00:31:25 +04:00
|
|
|
if (fix_problem(ctx, PR_1_EA_BAD_NAME, pctx))
|
|
|
|
goto clear_extattr;
|
2008-02-02 11:16:32 +03:00
|
|
|
break;
|
2001-07-20 00:31:25 +04:00
|
|
|
}
|
|
|
|
if (entry->e_value_block != 0) {
|
|
|
|
if (fix_problem(ctx, PR_1_EA_BAD_VALUE, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
}
|
2007-06-22 10:22:38 +04:00
|
|
|
if (entry->e_value_offs + entry->e_value_size > fs->blocksize) {
|
|
|
|
if (fix_problem(ctx, PR_1_EA_BAD_VALUE, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
break;
|
|
|
|
}
|
2001-07-26 03:48:24 +04:00
|
|
|
if (entry->e_value_size &&
|
|
|
|
region_allocate(region, entry->e_value_offs,
|
|
|
|
EXT2_EXT_ATTR_SIZE(entry->e_value_size))) {
|
2001-07-20 00:31:25 +04:00
|
|
|
if (fix_problem(ctx, PR_1_EA_ALLOC_COLLISION, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
}
|
2008-02-02 11:16:32 +03:00
|
|
|
|
|
|
|
hash = ext2fs_ext_attr_hash_entry(entry, block_buf +
|
|
|
|
entry->e_value_offs);
|
|
|
|
|
|
|
|
if (entry->e_hash != hash) {
|
|
|
|
pctx->num = entry->e_hash;
|
|
|
|
if (fix_problem(ctx, PR_1_ATTR_HASH, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
entry->e_hash = hash;
|
|
|
|
}
|
|
|
|
|
2001-07-20 00:31:25 +04:00
|
|
|
entry = EXT2_EXT_ATTR_NEXT(entry);
|
|
|
|
}
|
|
|
|
if (region_allocate(region, (char *)entry - (char *)header, 4)) {
|
|
|
|
if (fix_problem(ctx, PR_1_EA_ALLOC_COLLISION, pctx))
|
|
|
|
goto clear_extattr;
|
|
|
|
}
|
|
|
|
region_free(region);
|
2001-07-02 19:54:09 +04:00
|
|
|
|
|
|
|
count = header->h_refcount - 1;
|
|
|
|
if (count)
|
|
|
|
ea_refcount_store(ctx->refcount, blk, count);
|
|
|
|
mark_block_used(ctx, blk);
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_fast_mark_block_bitmap2(ctx->block_ea_map, blk);
|
2001-07-02 19:54:09 +04:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
clear_extattr:
|
2007-03-28 19:41:40 +04:00
|
|
|
if (region)
|
|
|
|
region_free(region);
|
2011-10-17 04:29:00 +04:00
|
|
|
ext2fs_file_acl_block_set(fs, inode, 0);
|
2001-07-02 19:54:09 +04:00
|
|
|
e2fsck_write_inode(ctx, ino, inode, "check_ext_attr");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:52:10 +04:00
|
|
|
/* Returns 1 if bad htree, 0 if OK */
|
|
|
|
static int handle_htree(e2fsck_t ctx, struct problem_context *pctx,
|
2007-08-21 05:31:11 +04:00
|
|
|
ext2_ino_t ino, struct ext2_inode *inode,
|
2002-06-27 00:52:10 +04:00
|
|
|
char *block_buf)
|
|
|
|
{
|
|
|
|
struct ext2_dx_root_info *root;
|
|
|
|
ext2_filsys fs = ctx->fs;
|
|
|
|
errcode_t retval;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blk;
|
2002-06-27 00:52:10 +04:00
|
|
|
|
|
|
|
if ((!LINUX_S_ISDIR(inode->i_mode) &&
|
|
|
|
fix_problem(ctx, PR_1_HTREE_NODIR, pctx)) ||
|
|
|
|
(!(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) &&
|
|
|
|
fix_problem(ctx, PR_1_HTREE_SET, pctx)))
|
|
|
|
return 1;
|
|
|
|
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_bmap2(fs, ino, inode, 0, 0, 0, 0, &blk);
|
2007-08-21 05:31:11 +04:00
|
|
|
|
|
|
|
if ((pctx->errcode) ||
|
|
|
|
(blk == 0) ||
|
|
|
|
(blk < fs->super->s_first_data_block) ||
|
2009-09-08 04:46:34 +04:00
|
|
|
(blk >= ext2fs_blocks_count(fs->super))) {
|
2007-08-21 05:31:11 +04:00
|
|
|
if (fix_problem(ctx, PR_1_HTREE_BADROOT, pctx))
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
2002-06-27 00:52:10 +04:00
|
|
|
|
2009-09-08 05:14:24 +04:00
|
|
|
retval = io_channel_read_blk64(fs->io, blk, 1, block_buf);
|
2002-06-27 00:52:10 +04:00
|
|
|
if (retval && fix_problem(ctx, PR_1_HTREE_BADROOT, pctx))
|
|
|
|
return 1;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2002-06-27 00:52:10 +04:00
|
|
|
/* XXX should check that beginning matches a directory */
|
|
|
|
root = (struct ext2_dx_root_info *) (block_buf + 24);
|
|
|
|
|
|
|
|
if ((root->reserved_zero || root->info_length < 8) &&
|
|
|
|
fix_problem(ctx, PR_1_HTREE_BADROOT, pctx))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
pctx->num = root->hash_version;
|
|
|
|
if ((root->hash_version != EXT2_HASH_LEGACY) &&
|
|
|
|
(root->hash_version != EXT2_HASH_HALF_MD4) &&
|
2002-08-17 21:32:21 +04:00
|
|
|
(root->hash_version != EXT2_HASH_TEA) &&
|
2002-06-27 00:52:10 +04:00
|
|
|
fix_problem(ctx, PR_1_HTREE_HASHV, pctx))
|
|
|
|
return 1;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2002-06-27 00:52:10 +04:00
|
|
|
if ((root->unused_flags & EXT2_HASH_FLAG_INCOMPAT) &&
|
|
|
|
fix_problem(ctx, PR_1_HTREE_INCOMPAT, pctx))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
pctx->num = root->indirect_levels;
|
|
|
|
if ((root->indirect_levels > 1) &&
|
|
|
|
fix_problem(ctx, PR_1_HTREE_DEPTH, pctx))
|
|
|
|
return 1;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2002-06-27 00:52:10 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2001-07-02 19:54:09 +04:00
|
|
|
|
2007-09-15 22:10:47 +04:00
|
|
|
void e2fsck_clear_inode(e2fsck_t ctx, ext2_ino_t ino,
|
|
|
|
struct ext2_inode *inode, int restart_flag,
|
|
|
|
const char *source)
|
|
|
|
{
|
2007-08-21 05:31:11 +04:00
|
|
|
inode->i_flags = 0;
|
2007-09-15 22:10:47 +04:00
|
|
|
inode->i_links_count = 0;
|
|
|
|
ext2fs_icount_store(ctx->inode_link_info, ino, 0);
|
|
|
|
inode->i_dtime = ctx->now;
|
|
|
|
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino);
|
|
|
|
ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino);
|
2007-09-15 22:10:47 +04:00
|
|
|
if (ctx->inode_reg_map)
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino);
|
2007-09-15 22:10:47 +04:00
|
|
|
if (ctx->inode_bad_map)
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino);
|
2007-09-15 22:10:47 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the inode was partially accounted for before processing
|
|
|
|
* was aborted, we need to restart the pass 1 scan.
|
|
|
|
*/
|
|
|
|
ctx->flags |= restart_flag;
|
|
|
|
|
2011-09-28 23:12:55 +04:00
|
|
|
if (ino == EXT2_BAD_INO)
|
|
|
|
memset(inode, 0, sizeof(struct ext2_inode));
|
|
|
|
|
2007-09-15 22:10:47 +04:00
|
|
|
e2fsck_write_inode(ctx, ino, inode, source);
|
|
|
|
}
|
|
|
|
|
2007-08-21 05:31:11 +04:00
|
|
|
static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
|
2008-06-03 04:12:34 +04:00
|
|
|
struct process_block_struct *pb,
|
|
|
|
blk64_t start_block,
|
2007-08-21 05:31:11 +04:00
|
|
|
ext2_extent_handle_t ehandle)
|
|
|
|
{
|
|
|
|
struct ext2fs_extent extent;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blk;
|
2007-08-21 05:31:11 +04:00
|
|
|
e2_blkcnt_t blockcnt;
|
2008-06-07 19:04:10 +04:00
|
|
|
unsigned int i;
|
2007-08-21 05:31:11 +04:00
|
|
|
int is_dir, is_leaf;
|
|
|
|
errcode_t problem;
|
2008-05-30 23:23:24 +04:00
|
|
|
struct ext2_extent_info info;
|
2007-08-21 05:31:11 +04:00
|
|
|
|
2008-05-30 23:23:24 +04:00
|
|
|
pctx->errcode = ext2fs_extent_get_info(ehandle, &info);
|
|
|
|
if (pctx->errcode)
|
|
|
|
return;
|
2007-08-21 05:31:11 +04:00
|
|
|
|
|
|
|
pctx->errcode = ext2fs_extent_get(ehandle, EXT2_EXTENT_FIRST_SIB,
|
|
|
|
&extent);
|
2008-05-30 23:23:24 +04:00
|
|
|
while (!pctx->errcode && info.num_entries-- > 0) {
|
2007-08-21 05:31:11 +04:00
|
|
|
is_leaf = extent.e_flags & EXT2_EXTENT_FLAGS_LEAF;
|
|
|
|
is_dir = LINUX_S_ISDIR(pctx->inode->i_mode);
|
|
|
|
|
|
|
|
problem = 0;
|
2010-05-15 02:03:14 +04:00
|
|
|
if (extent.e_pblk == 0 ||
|
|
|
|
extent.e_pblk < ctx->fs->super->s_first_data_block ||
|
2009-09-08 04:46:34 +04:00
|
|
|
extent.e_pblk >= ext2fs_blocks_count(ctx->fs->super))
|
2007-08-21 05:31:11 +04:00
|
|
|
problem = PR_1_EXTENT_BAD_START_BLK;
|
2008-06-03 04:12:34 +04:00
|
|
|
else if (extent.e_lblk < start_block)
|
|
|
|
problem = PR_1_OUT_OF_ORDER_EXTENTS;
|
2008-04-02 05:38:58 +04:00
|
|
|
else if (is_leaf &&
|
|
|
|
(extent.e_pblk + extent.e_len) >
|
2009-09-08 04:46:34 +04:00
|
|
|
ext2fs_blocks_count(ctx->fs->super))
|
2007-08-21 05:31:11 +04:00
|
|
|
problem = PR_1_EXTENT_ENDS_BEYOND;
|
|
|
|
|
|
|
|
if (problem) {
|
2008-12-26 06:42:38 +03:00
|
|
|
report_problem:
|
2007-08-21 05:31:11 +04:00
|
|
|
pctx->blk = extent.e_pblk;
|
|
|
|
pctx->blk2 = extent.e_lblk;
|
|
|
|
pctx->num = extent.e_len;
|
|
|
|
if (fix_problem(ctx, problem, pctx)) {
|
e2fsck: Fix segmentation fault when checking a file system
If a corrupted file system causes us to want to delete an extent, and
that causes us to want to release a block in e2fsck pass #1, it would
be preferable if e2fsck didn't seg fault. This tends to get users
craky, as users are wont to do. :-)
Thanks to Dirk Reiners for reporting this bug:
e2fsck crashes fixing a corrupted 3.5 TB filesystem:
0x0000000000432002 in ext2fs_unmark_generic_bitmap (bitmap=0x0, bitno=623386749)
at gen_bitmap.c:183
183 if ((bitno < bitmap->start) || (bitno > bitmap->end)) {
(gdb) bt
bitno=623386749) at gen_bitmap.c:183
block=623386749) at ../../lib/ext2fs/bitops.h:319
inuse=-1) at alloc_stats.c:78
extent.c:1509
pb=0x7fffffffdfe0, start_block=0, ehandle=0x6dcf50) at pass1.c:1709
pb=0x7fffffffdfe0, start_block=0, ehandle=0x6dcf50) at pass1.c:1737
pctx=0x7fffffffe100, pb=0x7fffffffdfe0) at pass1.c:1842
block_buf=0x6c4330 "\373\212#") at pass1.c:1920
The source of the NULL bitmap is fs on stack frame 2:
(gdb) up 2
inuse=-1) at alloc_stats.c:78
78 ext2fs_unmark_block_bitmap(fs->block_map, blk);
Addresses-SourceForge-Bug: #2971800
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-03-17 20:32:52 +03:00
|
|
|
e2fsck_read_bitmaps(ctx);
|
2007-08-21 05:31:11 +04:00
|
|
|
pctx->errcode =
|
|
|
|
ext2fs_extent_delete(ehandle, 0);
|
|
|
|
if (pctx->errcode) {
|
2008-12-26 06:42:38 +03:00
|
|
|
pctx->str = "ext2fs_extent_delete";
|
2007-08-21 05:31:11 +04:00
|
|
|
return;
|
|
|
|
}
|
2008-05-28 12:54:44 +04:00
|
|
|
pctx->errcode = ext2fs_extent_get(ehandle,
|
|
|
|
EXT2_EXTENT_CURRENT,
|
|
|
|
&extent);
|
|
|
|
if (pctx->errcode == EXT2_ET_NO_CURRENT_NODE) {
|
|
|
|
pctx->errcode = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
2007-08-21 05:31:11 +04:00
|
|
|
}
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_leaf) {
|
2008-12-26 06:42:38 +03:00
|
|
|
blk = extent.e_pblk;
|
2007-08-21 05:31:11 +04:00
|
|
|
pctx->errcode = ext2fs_extent_get(ehandle,
|
|
|
|
EXT2_EXTENT_DOWN, &extent);
|
|
|
|
if (pctx->errcode) {
|
2008-12-26 06:42:38 +03:00
|
|
|
pctx->str = "EXT2_EXTENT_DOWN";
|
|
|
|
problem = PR_1_EXTENT_HEADER_INVALID;
|
|
|
|
if (pctx->errcode == EXT2_ET_EXTENT_HEADER_BAD)
|
|
|
|
goto report_problem;
|
|
|
|
return;
|
2007-08-21 05:31:11 +04:00
|
|
|
}
|
2008-06-03 04:12:34 +04:00
|
|
|
scan_extent_node(ctx, pctx, pb, extent.e_lblk, ehandle);
|
2008-12-26 06:42:38 +03:00
|
|
|
if (pctx->errcode)
|
|
|
|
return;
|
2007-08-21 05:31:11 +04:00
|
|
|
pctx->errcode = ext2fs_extent_get(ehandle,
|
|
|
|
EXT2_EXTENT_UP, &extent);
|
|
|
|
if (pctx->errcode) {
|
2008-12-26 06:42:38 +03:00
|
|
|
pctx->str = "EXT2_EXTENT_UP";
|
|
|
|
return;
|
2007-08-21 05:31:11 +04:00
|
|
|
}
|
2008-12-26 06:42:38 +03:00
|
|
|
mark_block_used(ctx, blk);
|
|
|
|
pb->num_blocks++;
|
2007-08-21 05:31:11 +04:00
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
2008-08-11 06:43:24 +04:00
|
|
|
if ((pb->previous_block != 0) &&
|
|
|
|
(pb->previous_block+1 != extent.e_pblk)) {
|
2008-12-09 06:00:13 +03:00
|
|
|
if (ctx->options & E2F_OPT_FRAGCHECK) {
|
|
|
|
char type = '?';
|
|
|
|
|
|
|
|
if (pb->is_dir)
|
|
|
|
type = 'd';
|
|
|
|
else if (pb->is_reg)
|
|
|
|
type = 'f';
|
|
|
|
|
|
|
|
printf(("%6lu(%c): expecting %6lu "
|
|
|
|
"actual extent "
|
2008-08-11 06:43:24 +04:00
|
|
|
"phys %6lu log %lu len %lu\n"),
|
2008-12-09 06:00:13 +03:00
|
|
|
(unsigned long) pctx->ino, type,
|
2008-08-11 06:43:24 +04:00
|
|
|
(unsigned long) pb->previous_block+1,
|
|
|
|
(unsigned long) extent.e_pblk,
|
|
|
|
(unsigned long) extent.e_lblk,
|
|
|
|
(unsigned long) extent.e_len);
|
2008-12-09 06:00:13 +03:00
|
|
|
}
|
2008-08-11 06:43:24 +04:00
|
|
|
pb->fragmented = 1;
|
|
|
|
}
|
2009-11-29 08:06:10 +03:00
|
|
|
while (is_dir && ++pb->last_db_block < extent.e_lblk) {
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_add_dir_block2(ctx->fs->dblist,
|
|
|
|
pb->ino, 0,
|
|
|
|
pb->last_db_block);
|
2009-11-29 08:06:10 +03:00
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->blk = 0;
|
|
|
|
pctx->num = pb->last_db_block;
|
|
|
|
goto failed_add_dir_block;
|
|
|
|
}
|
|
|
|
}
|
2007-08-21 05:31:11 +04:00
|
|
|
for (blk = extent.e_pblk, blockcnt = extent.e_lblk, i = 0;
|
|
|
|
i < extent.e_len;
|
|
|
|
blk++, blockcnt++, i++) {
|
2011-06-11 02:58:16 +04:00
|
|
|
if (!(ctx->fs->cluster_ratio_bits &&
|
|
|
|
pb->previous_block &&
|
|
|
|
(EXT2FS_B2C(ctx->fs, blk) ==
|
|
|
|
EXT2FS_B2C(ctx->fs, pb->previous_block)) &&
|
|
|
|
(blk & EXT2FS_CLUSTER_MASK(ctx->fs)) ==
|
2011-06-16 18:12:43 +04:00
|
|
|
(blockcnt & EXT2FS_CLUSTER_MASK(ctx->fs)))) {
|
2011-06-11 02:58:16 +04:00
|
|
|
mark_block_used(ctx, blk);
|
2011-06-16 18:12:43 +04:00
|
|
|
pb->num_blocks++;
|
|
|
|
}
|
2011-06-11 02:58:16 +04:00
|
|
|
|
|
|
|
pb->previous_block = blk;
|
2007-08-21 05:31:11 +04:00
|
|
|
|
|
|
|
if (is_dir) {
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_add_dir_block2(ctx->fs->dblist, pctx->ino, blk, blockcnt);
|
2007-08-21 05:31:11 +04:00
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->blk = blk;
|
|
|
|
pctx->num = blockcnt;
|
2009-11-29 08:06:10 +03:00
|
|
|
failed_add_dir_block:
|
2007-08-21 05:31:11 +04:00
|
|
|
fix_problem(ctx, PR_1_ADD_DBLOCK, pctx);
|
|
|
|
/* Should never get here */
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-11-29 08:06:10 +03:00
|
|
|
if (is_dir && extent.e_len > 0)
|
|
|
|
pb->last_db_block = blockcnt - 1;
|
2008-08-11 06:43:24 +04:00
|
|
|
pb->previous_block = extent.e_pblk + extent.e_len - 1;
|
2010-04-08 23:51:10 +04:00
|
|
|
start_block = pb->last_block = extent.e_lblk + extent.e_len - 1;
|
2007-08-21 05:31:11 +04:00
|
|
|
next:
|
|
|
|
pctx->errcode = ext2fs_extent_get(ehandle,
|
|
|
|
EXT2_EXTENT_NEXT_SIB,
|
|
|
|
&extent);
|
|
|
|
}
|
|
|
|
if (pctx->errcode == EXT2_ET_EXTENT_NO_NEXT)
|
|
|
|
pctx->errcode = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void check_blocks_extents(e2fsck_t ctx, struct problem_context *pctx,
|
2008-06-07 19:04:10 +04:00
|
|
|
struct process_block_struct *pb)
|
2007-08-21 05:31:11 +04:00
|
|
|
{
|
2008-08-14 17:48:07 +04:00
|
|
|
struct ext2_extent_info info;
|
2007-08-21 05:31:11 +04:00
|
|
|
struct ext2_inode *inode = pctx->inode;
|
|
|
|
ext2_extent_handle_t ehandle;
|
|
|
|
ext2_filsys fs = ctx->fs;
|
|
|
|
ext2_ino_t ino = pctx->ino;
|
2008-08-14 17:48:07 +04:00
|
|
|
errcode_t retval;
|
2007-08-21 05:31:11 +04:00
|
|
|
|
2009-05-20 00:34:12 +04:00
|
|
|
pctx->errcode = ext2fs_extent_open2(fs, ino, inode, &ehandle);
|
2009-05-17 16:42:52 +04:00
|
|
|
if (pctx->errcode) {
|
|
|
|
if (fix_problem(ctx, PR_1_READ_EXTENT, pctx))
|
|
|
|
e2fsck_clear_inode(ctx, ino, inode, 0,
|
|
|
|
"check_blocks_extents");
|
2007-08-21 05:31:11 +04:00
|
|
|
pctx->errcode = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-08-14 17:48:07 +04:00
|
|
|
retval = ext2fs_extent_get_info(ehandle, &info);
|
|
|
|
if (retval == 0) {
|
|
|
|
if (info.max_depth >= MAX_EXTENT_DEPTH_COUNT)
|
|
|
|
info.max_depth = MAX_EXTENT_DEPTH_COUNT-1;
|
|
|
|
ctx->extent_depth_count[info.max_depth]++;
|
|
|
|
}
|
|
|
|
|
2008-06-03 04:12:34 +04:00
|
|
|
scan_extent_node(ctx, pctx, pb, 0, ehandle);
|
2008-12-26 06:42:38 +03:00
|
|
|
if (pctx->errcode &&
|
|
|
|
fix_problem(ctx, PR_1_EXTENT_ITERATE_FAILURE, pctx)) {
|
|
|
|
pb->num_blocks = 0;
|
|
|
|
inode->i_blocks = 0;
|
|
|
|
e2fsck_clear_inode(ctx, ino, inode, E2F_FLAG_RESTART,
|
|
|
|
"check_blocks_extents");
|
|
|
|
pctx->errcode = 0;
|
|
|
|
}
|
2007-08-21 05:31:11 +04:00
|
|
|
ext2fs_extent_free(ehandle);
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* This subroutine is called on each inode to account for all of the
|
|
|
|
* blocks used by that inode.
|
|
|
|
*/
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
|
1997-04-26 17:21:57 +04:00
|
|
|
char *block_buf)
|
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ext2_filsys fs = ctx->fs;
|
1997-04-26 17:21:57 +04:00
|
|
|
struct process_block_struct pb;
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
ext2_ino_t ino = pctx->ino;
|
1997-04-29 20:15:03 +04:00
|
|
|
struct ext2_inode *inode = pctx->inode;
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
int bad_size = 0;
|
2002-06-27 00:52:10 +04:00
|
|
|
int dirty_inode = 0;
|
2008-07-07 08:02:47 +04:00
|
|
|
int extent_fs;
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
__u64 size;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
pb.ino = ino;
|
2002-08-17 18:19:44 +04:00
|
|
|
pb.num_blocks = 0;
|
|
|
|
pb.last_block = -1;
|
2009-11-28 17:35:37 +03:00
|
|
|
pb.last_db_block = -1;
|
1997-04-26 17:34:30 +04:00
|
|
|
pb.num_illegal_blocks = 0;
|
1997-04-29 20:15:03 +04:00
|
|
|
pb.suppress = 0; pb.clear = 0;
|
1997-04-26 18:37:06 +04:00
|
|
|
pb.fragmented = 0;
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
pb.compressed = 0;
|
1997-04-26 18:37:06 +04:00
|
|
|
pb.previous_block = 0;
|
2002-05-18 23:16:30 +04:00
|
|
|
pb.is_dir = LINUX_S_ISDIR(inode->i_mode);
|
2002-05-22 05:19:14 +04:00
|
|
|
pb.is_reg = LINUX_S_ISREG(inode->i_mode);
|
|
|
|
pb.max_blocks = 1 << (31 - fs->super->s_log_block_size);
|
1997-04-26 17:34:30 +04:00
|
|
|
pb.inode = inode;
|
1997-04-29 20:15:03 +04:00
|
|
|
pb.pctx = pctx;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pb.ctx = ctx;
|
|
|
|
pctx->ino = ino;
|
2002-08-17 18:19:44 +04:00
|
|
|
pctx->errcode = 0;
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
|
2008-07-07 08:02:47 +04:00
|
|
|
extent_fs = (ctx->fs->super->s_feature_incompat &
|
|
|
|
EXT3_FEATURE_INCOMPAT_EXTENTS);
|
|
|
|
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
if (inode->i_flags & EXT2_COMPRBLK_FL) {
|
2001-01-01 17:52:52 +03:00
|
|
|
if (fs->super->s_feature_incompat &
|
|
|
|
EXT2_FEATURE_INCOMPAT_COMPRESSION)
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
pb.compressed = 1;
|
|
|
|
else {
|
|
|
|
if (fix_problem(ctx, PR_1_COMPR_SET, pctx)) {
|
|
|
|
inode->i_flags &= ~EXT2_COMPRBLK_FL;
|
2002-06-27 00:52:10 +04:00
|
|
|
dirty_inode++;
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-17 04:29:00 +04:00
|
|
|
if (ext2fs_file_acl_block(fs, inode) &&
|
2009-09-08 06:29:45 +04:00
|
|
|
check_ext_attr(ctx, pctx, block_buf)) {
|
2008-02-02 11:16:32 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
|
|
|
goto out;
|
2005-03-21 00:57:10 +03:00
|
|
|
pb.num_blocks++;
|
2008-02-02 11:16:32 +03:00
|
|
|
}
|
2005-03-21 00:57:10 +03:00
|
|
|
|
2011-10-17 04:29:00 +04:00
|
|
|
if (ext2fs_inode_has_valid_blocks2(fs, inode)) {
|
2008-07-07 08:02:47 +04:00
|
|
|
if (extent_fs && (inode->i_flags & EXT4_EXTENTS_FL))
|
2008-06-07 19:04:10 +04:00
|
|
|
check_blocks_extents(ctx, pctx, &pb);
|
2007-08-21 05:31:11 +04:00
|
|
|
else
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_block_iterate3(fs, ino,
|
2007-08-21 05:31:11 +04:00
|
|
|
pb.is_dir ? BLOCK_FLAG_HOLE : 0,
|
|
|
|
block_buf, process_block, &pb);
|
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
end_problem_latch(ctx, PR_LATCH_BLOCK);
|
2002-05-22 05:19:14 +04:00
|
|
|
end_problem_latch(ctx, PR_LATCH_TOOBIG);
|
2002-08-17 18:19:44 +04:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
|
|
|
goto out;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx->errcode)
|
|
|
|
fix_problem(ctx, PR_1_BLOCK_ITERATE, pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
2008-12-09 05:33:11 +03:00
|
|
|
if (pb.fragmented && pb.num_blocks < fs->super->s_blocks_per_group) {
|
|
|
|
if (LINUX_S_ISDIR(inode->i_mode))
|
|
|
|
ctx->fs_fragmented_dir++;
|
|
|
|
else
|
|
|
|
ctx->fs_fragmented++;
|
|
|
|
}
|
1997-04-26 18:37:06 +04:00
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
if (pb.clear) {
|
2007-09-15 22:10:47 +04:00
|
|
|
e2fsck_clear_inode(ctx, ino, inode, E2F_FLAG_RESTART,
|
|
|
|
"check_blocks");
|
|
|
|
return;
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2002-06-26 07:26:34 +04:00
|
|
|
if (inode->i_flags & EXT2_INDEX_FL) {
|
2002-06-27 00:52:10 +04:00
|
|
|
if (handle_htree(ctx, pctx, ino, inode, block_buf)) {
|
|
|
|
inode->i_flags &= ~EXT2_INDEX_FL;
|
|
|
|
dirty_inode++;
|
|
|
|
} else {
|
2002-06-26 07:26:34 +04:00
|
|
|
#ifdef ENABLE_HTREE
|
|
|
|
e2fsck_add_dx_dir(ctx, ino, pb.last_block+1);
|
|
|
|
#endif
|
2002-06-27 00:52:10 +04:00
|
|
|
}
|
2002-06-26 07:26:34 +04:00
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
if (!pb.num_blocks && pb.is_dir) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_ZERO_LENGTH_DIR, pctx)) {
|
2007-09-15 22:10:47 +04:00
|
|
|
e2fsck_clear_inode(ctx, ino, inode, 0, "check_blocks");
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_directory_count--;
|
2007-09-15 22:10:47 +04:00
|
|
|
return;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2002-08-17 18:19:44 +04:00
|
|
|
|
2011-07-20 22:40:06 +04:00
|
|
|
if (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super)) {
|
|
|
|
quota_data_add(ctx->qctx, inode, ino,
|
|
|
|
pb.num_blocks * fs->blocksize);
|
|
|
|
quota_data_inodes(ctx->qctx, inode, ino, +1);
|
|
|
|
}
|
|
|
|
|
2008-04-09 19:39:11 +04:00
|
|
|
if (!(fs->super->s_feature_ro_compat &
|
|
|
|
EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
|
|
|
|
!(inode->i_flags & EXT4_HUGE_FILE_FL))
|
|
|
|
pb.num_blocks *= (fs->blocksize / 512);
|
2011-06-16 18:12:43 +04:00
|
|
|
pb.num_blocks *= EXT2FS_CLUSTER_RATIO(fs);
|
2002-08-17 18:19:44 +04:00
|
|
|
#if 0
|
2011-06-16 18:12:43 +04:00
|
|
|
printf("inode %u, i_size = %u, last_block = %lld, i_blocks=%llu, num_blocks = %llu\n",
|
2010-06-14 01:00:00 +04:00
|
|
|
ino, inode->i_size, pb.last_block, ext2fs_inode_i_blocks(fs, inode),
|
2002-08-17 18:19:44 +04:00
|
|
|
pb.num_blocks);
|
|
|
|
#endif
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
if (pb.is_dir) {
|
|
|
|
int nblock = inode->i_size >> EXT2_BLOCK_SIZE_BITS(fs->super);
|
2008-08-28 07:07:54 +04:00
|
|
|
if (inode->i_size & (fs->blocksize - 1))
|
2008-03-13 07:58:54 +03:00
|
|
|
bad_size = 5;
|
|
|
|
else if (nblock > (pb.last_block + 1))
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
bad_size = 1;
|
|
|
|
else if (nblock < (pb.last_block + 1)) {
|
|
|
|
if (((pb.last_block + 1) - nblock) >
|
2001-01-01 18:51:50 +03:00
|
|
|
fs->super->s_prealloc_dir_blocks)
|
1998-06-11 00:45:22 +04:00
|
|
|
bad_size = 2;
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
}
|
|
|
|
} else {
|
2007-08-04 04:43:37 +04:00
|
|
|
e2_blkcnt_t blkpg = ctx->blocks_per_page;
|
|
|
|
|
2003-01-23 02:28:15 +03:00
|
|
|
size = EXT2_I_SIZE(inode);
|
2002-08-17 18:19:44 +04:00
|
|
|
if ((pb.last_block >= 0) &&
|
2007-08-04 04:43:37 +04:00
|
|
|
/* allow allocated blocks to end of PAGE_SIZE */
|
|
|
|
(size < (__u64)pb.last_block * fs->blocksize) &&
|
|
|
|
(pb.last_block / blkpg * blkpg != pb.last_block ||
|
2010-02-24 19:24:37 +03:00
|
|
|
size < (__u64)(pb.last_block & ~(blkpg-1)) *fs->blocksize) &&
|
|
|
|
!(inode->i_flags & EXT4_EOFBLOCKS_FL))
|
1998-06-11 00:45:22 +04:00
|
|
|
bad_size = 3;
|
2008-07-07 08:02:47 +04:00
|
|
|
else if (!(extent_fs && (inode->i_flags & EXT4_EXTENTS_FL)) &&
|
|
|
|
size > ext2_max_sizes[fs->super->s_log_block_size])
|
|
|
|
/* too big for a direct/indirect-mapped file */
|
1998-06-11 00:45:22 +04:00
|
|
|
bad_size = 4;
|
2008-07-07 08:02:47 +04:00
|
|
|
else if ((extent_fs && (inode->i_flags & EXT4_EXTENTS_FL)) &&
|
2008-08-17 17:41:38 +04:00
|
|
|
size >
|
2008-11-16 18:03:00 +03:00
|
|
|
((1ULL << (32 + EXT2_BLOCK_SIZE_BITS(fs->super))) - 1))
|
2008-07-07 08:02:47 +04:00
|
|
|
/* too big for an extent-based file - 32bit ee_block */
|
|
|
|
bad_size = 6;
|
2010-05-10 18:17:44 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check to see if the EOFBLOCKS flag is set where it
|
|
|
|
* doesn't need to be.
|
|
|
|
*/
|
|
|
|
if ((inode->i_flags & EXT4_EOFBLOCKS_FL) &&
|
2010-05-19 22:20:13 +04:00
|
|
|
(size >= (((__u64)pb.last_block + 1) * fs->blocksize))) {
|
2010-05-10 18:17:44 +04:00
|
|
|
pctx->blkcount = pb.last_block;
|
|
|
|
if (fix_problem(ctx, PR_1_EOFBLOCKS_FL_SET, pctx)) {
|
|
|
|
inode->i_flags &= ~EXT4_EOFBLOCKS_FL;
|
|
|
|
dirty_inode++;
|
|
|
|
}
|
|
|
|
}
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
}
|
2002-08-17 18:19:44 +04:00
|
|
|
/* i_size for symlinks is checked elsewhere */
|
|
|
|
if (bad_size && !LINUX_S_ISLNK(inode->i_mode)) {
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx->num = (pb.last_block+1) * fs->blocksize;
|
2008-08-17 17:41:38 +04:00
|
|
|
pctx->group = bad_size;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_BAD_I_SIZE, pctx)) {
|
1997-04-29 20:15:03 +04:00
|
|
|
inode->i_size = pctx->num;
|
2002-08-17 18:19:44 +04:00
|
|
|
if (!LINUX_S_ISDIR(inode->i_mode))
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
inode->i_size_high = pctx->num >> 32;
|
2002-06-27 00:52:10 +04:00
|
|
|
dirty_inode++;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
|
|
|
pctx->num = 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2011-07-09 03:54:57 +04:00
|
|
|
if (LINUX_S_ISREG(inode->i_mode) && EXT2_I_SIZE(inode) >= 0x80000000UL)
|
Many files:
unix.c: Fix bug in check of feature set, to make sure we can really
fix this filesystem.
problem.h: Make blkcount type to be of type blkcnt_t. Make the num
field be a 64 bit type. Add the problem code PR_1_FEATURE_LARGE_FILES
problem.c: Add table entry for the problem code PR_1_FEATURE_LARGE_FILES.
pass1.c (e2fsck_pass1): A non-zero i_dir_acl field is only a problem
for directory inodes. (Since it is also i_size_high now.) If there
are no large_files, then clear the LARGE_FLAG feature flag. If there
are large_files, but the LARGE_FLAG feature flag is not set, complain
and offer to fix it.
(check_blocks): Add support to deal with non-directory inodes that
have i_size_high set (i.e., large_files). Don't give an error if a
directory has preallocated blocks, to support the DIR_PREALLOC
feature.
(process_block, process_bad_block): The blockcnt variable is a type of
blkcnt_t, for conversion to the new block_iterate2.
pass2.c (process_bad_inode): A non-zero i_dir_acl field is only a
problem for directory inodes. (Since it is also i_size_high now.)
message.c (expand_inode_expression): Print a 64-bits of the inode size
for non-directory inodes. (Directory inodes can only use a 32-bit
directory acl size, since i_size_high is shared with i_dir_acl.) Add
sanity check so that trying to print out the directory acl on a
non-directory inode will print zero. (expand_percent_expression): %B
and %N, which print pctx->blkcount and pctx->num, can now be 64 bit
variables. Print them using the "%lld" format if EXT2_NO_64_TYPE is
not defined.
e2fsck.h: Add the large_flagsfield to the e2fsck context.
e2fsck.c (e2fsck_reset_context): Clear the large_flags field.
ChangeLog, expect.1:
f_messy_inode: Modify test to deal with changes to support 64-bit size
files. (/MAKEDEV had i_dir_acl, now i_size_high, set.)
1998-03-24 19:22:38 +03:00
|
|
|
ctx->large_files++;
|
2009-10-13 05:59:37 +04:00
|
|
|
if ((pb.num_blocks != ext2fs_inode_i_blocks(fs, inode)) ||
|
2008-04-09 19:39:11 +04:00
|
|
|
((fs->super->s_feature_ro_compat &
|
|
|
|
EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
|
|
|
|
(inode->i_flags & EXT4_HUGE_FILE_FL) &&
|
|
|
|
(inode->osd2.linux2.l_i_blocks_hi != 0))) {
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx->num = pb.num_blocks;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_BAD_I_BLOCKS, pctx)) {
|
1997-04-26 17:21:57 +04:00
|
|
|
inode->i_blocks = pb.num_blocks;
|
2010-09-25 06:57:06 +04:00
|
|
|
inode->osd2.linux2.l_i_blocks_hi = pb.num_blocks >> 32;
|
2002-06-27 00:52:10 +04:00
|
|
|
dirty_inode++;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
|
|
|
pctx->num = 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2009-11-28 17:44:08 +03:00
|
|
|
|
|
|
|
if (ctx->dirs_to_hash && pb.is_dir &&
|
|
|
|
!(inode->i_flags & EXT2_INDEX_FL) &&
|
|
|
|
((inode->i_size / fs->blocksize) >= 3))
|
|
|
|
ext2fs_u32_list_add(ctx->dirs_to_hash, ino);
|
|
|
|
|
2002-06-27 00:52:10 +04:00
|
|
|
out:
|
|
|
|
if (dirty_inode)
|
|
|
|
e2fsck_write_inode(ctx, ino, inode, "check_blocks");
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
|
|
|
|
1997-04-29 20:15:03 +04:00
|
|
|
#if 0
|
1997-04-26 17:58:21 +04:00
|
|
|
/*
|
|
|
|
* Helper function called by process block when an illegal block is
|
|
|
|
* found. It returns a description about why the block is illegal
|
|
|
|
*/
|
2010-06-14 01:00:00 +04:00
|
|
|
static char *describe_illegal_block(ext2_filsys fs, blk64_t block)
|
1997-04-26 17:58:21 +04:00
|
|
|
{
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t super;
|
1997-04-26 17:58:21 +04:00
|
|
|
int i;
|
|
|
|
static char problem[80];
|
|
|
|
|
|
|
|
super = fs->super->s_first_data_block;
|
|
|
|
strcpy(problem, "PROGRAMMING ERROR: Unknown reason for illegal block");
|
|
|
|
if (block < super) {
|
|
|
|
sprintf(problem, "< FIRSTBLOCK (%u)", super);
|
|
|
|
return(problem);
|
2009-09-08 04:46:34 +04:00
|
|
|
} else if (block >= ext2fs_blocks_count(fs->super)) {
|
|
|
|
sprintf(problem, "> BLOCKS (%u)", ext2fs_blocks_count(fs->super));
|
1997-04-26 17:58:21 +04:00
|
|
|
return(problem);
|
|
|
|
}
|
|
|
|
for (i = 0; i < fs->group_desc_count; i++) {
|
|
|
|
if (block == super) {
|
|
|
|
sprintf(problem, "is the superblock in group %d", i);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (block > super &&
|
|
|
|
block <= (super + fs->desc_blocks)) {
|
|
|
|
sprintf(problem, "is in the group descriptors "
|
|
|
|
"of group %d", i);
|
|
|
|
break;
|
|
|
|
}
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (block == ext2fs_block_bitmap_loc(fs, i)) {
|
1997-04-26 17:58:21 +04:00
|
|
|
sprintf(problem, "is the block bitmap of group %d", i);
|
|
|
|
break;
|
|
|
|
}
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (block == ext2fs_inode_bitmap_loc(fs, i)) {
|
1997-04-26 17:58:21 +04:00
|
|
|
sprintf(problem, "is the inode bitmap of group %d", i);
|
|
|
|
break;
|
|
|
|
}
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (block >= ext2fs_inode_table_loc(fs, i) &&
|
|
|
|
(block < ext2fs_inode_table_loc(fs, i)
|
1997-04-26 17:58:21 +04:00
|
|
|
+ fs->inode_blocks_per_group)) {
|
|
|
|
sprintf(problem, "is in the inode table of group %d",
|
|
|
|
i);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
super += fs->super->s_blocks_per_group;
|
|
|
|
}
|
|
|
|
return(problem);
|
|
|
|
}
|
1997-04-29 20:15:03 +04:00
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a helper function for check_blocks().
|
|
|
|
*/
|
2001-01-06 08:55:58 +03:00
|
|
|
static int process_block(ext2_filsys fs,
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t *block_nr,
|
1998-06-11 00:45:22 +04:00
|
|
|
e2_blkcnt_t blockcnt,
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t ref_block EXT2FS_ATTR((unused)),
|
2003-12-07 09:28:50 +03:00
|
|
|
int ref_offset EXT2FS_ATTR((unused)),
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
void *priv_data)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
|
|
|
struct process_block_struct *p;
|
1997-04-29 20:15:03 +04:00
|
|
|
struct problem_context *pctx;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blk = *block_nr;
|
1997-04-26 17:58:21 +04:00
|
|
|
int ret_code = 0;
|
1997-04-29 20:15:03 +04:00
|
|
|
int problem = 0;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
e2fsck_t ctx;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
p = (struct process_block_struct *) priv_data;
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx = p->pctx;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx = p->ctx;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
if (p->compressed && (blk == EXT2FS_COMPRESSED_BLKADDR)) {
|
|
|
|
/* todo: Check that the comprblk_fl is high, that the
|
|
|
|
blkaddr pattern looks right (all non-holes up to
|
|
|
|
first EXT2FS_COMPRESSED_BLKADDR, then all
|
|
|
|
EXT2FS_COMPRESSED_BLKADDR up to end of cluster),
|
|
|
|
that the feature_incompat bit is high, and that the
|
|
|
|
inode is a regular file. If we're doing a "full
|
|
|
|
check" (a concept introduced to e2fsck by e2compr,
|
|
|
|
meaning that we look at data blocks as well as
|
|
|
|
metadata) then call some library routine that
|
|
|
|
checks the compressed data. I'll have to think
|
|
|
|
about this, because one particularly important
|
|
|
|
problem to be able to fix is to recalculate the
|
|
|
|
cluster size if necessary. I think that perhaps
|
|
|
|
we'd better do most/all e2compr-specific checks
|
|
|
|
separately, after the non-e2compr checks. If not
|
|
|
|
doing a full check, it may be useful to test that
|
|
|
|
the personality is linux; e.g. if it isn't then
|
|
|
|
perhaps this really is just an illegal block. */
|
|
|
|
return 0;
|
|
|
|
}
|
2002-05-18 23:16:30 +04:00
|
|
|
|
2009-11-28 17:35:37 +03:00
|
|
|
if (blk == 0)
|
1997-04-26 17:58:21 +04:00
|
|
|
return 0;
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
#if 0
|
1997-04-26 17:58:21 +04:00
|
|
|
printf("Process_block, inode %lu, block %u, #%d\n", p->ino, blk,
|
1997-04-26 17:21:57 +04:00
|
|
|
blockcnt);
|
1997-04-26 17:58:21 +04:00
|
|
|
#endif
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 18:37:06 +04:00
|
|
|
/*
|
|
|
|
* Simplistic fragmentation check. We merely require that the
|
|
|
|
* file be contiguous. (Which can never be true for really
|
|
|
|
* big files that are greater than a block group.)
|
|
|
|
*/
|
2008-08-11 06:43:24 +04:00
|
|
|
if (!HOLE_BLKADDR(p->previous_block) && p->ino != EXT2_RESIZE_INO) {
|
|
|
|
if (p->previous_block+1 != blk) {
|
2008-12-09 06:00:13 +03:00
|
|
|
if (ctx->options & E2F_OPT_FRAGCHECK) {
|
|
|
|
char type = '?';
|
|
|
|
|
|
|
|
if (p->is_dir)
|
|
|
|
type = 'd';
|
|
|
|
else if (p->is_reg)
|
|
|
|
type = 'f';
|
|
|
|
|
|
|
|
printf(_("%6lu(%c): expecting %6lu "
|
|
|
|
"got phys %6lu (blkcnt %lld)\n"),
|
|
|
|
(unsigned long) pctx->ino, type,
|
2008-08-11 06:43:24 +04:00
|
|
|
(unsigned long) p->previous_block+1,
|
|
|
|
(unsigned long) blk,
|
2008-08-13 06:11:02 +04:00
|
|
|
blockcnt);
|
2008-12-09 06:00:13 +03:00
|
|
|
}
|
1997-04-26 18:37:06 +04:00
|
|
|
p->fragmented = 1;
|
2008-08-11 06:43:24 +04:00
|
|
|
}
|
1997-04-26 18:37:06 +04:00
|
|
|
}
|
2002-06-27 00:52:10 +04:00
|
|
|
|
2004-07-27 04:11:49 +04:00
|
|
|
if (p->is_dir && blockcnt > (1 << (21 - fs->super->s_log_block_size)))
|
2002-05-22 05:19:14 +04:00
|
|
|
problem = PR_1_TOOBIG_DIR;
|
|
|
|
if (p->is_reg && p->num_blocks+1 >= p->max_blocks)
|
|
|
|
problem = PR_1_TOOBIG_REG;
|
|
|
|
if (!p->is_dir && !p->is_reg && blockcnt > 0)
|
|
|
|
problem = PR_1_TOOBIG_SYMLINK;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
if (blk < fs->super->s_first_data_block ||
|
2009-09-08 04:46:34 +04:00
|
|
|
blk >= ext2fs_blocks_count(fs->super))
|
1997-04-29 20:15:03 +04:00
|
|
|
problem = PR_1_ILLEGAL_BLOCK_NUM;
|
|
|
|
|
|
|
|
if (problem) {
|
1997-04-26 17:34:30 +04:00
|
|
|
p->num_illegal_blocks++;
|
1997-04-29 20:15:03 +04:00
|
|
|
if (!p->suppress && (p->num_illegal_blocks % 12) == 0) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_TOO_MANY_BAD_BLOCKS, pctx)) {
|
1997-04-26 17:34:30 +04:00
|
|
|
p->clear = 1;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
if (fix_problem(ctx, PR_1_SUPPRESS_MESSAGES, pctx)) {
|
1997-04-26 17:34:30 +04:00
|
|
|
p->suppress = 1;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
set_latch_flags(PR_LATCH_BLOCK,
|
|
|
|
PRL_SUPPRESS, 0);
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
|
|
|
}
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx->blk = blk;
|
|
|
|
pctx->blkcount = blockcnt;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, problem, pctx)) {
|
1997-04-26 17:58:21 +04:00
|
|
|
blk = *block_nr = 0;
|
|
|
|
ret_code = BLOCK_CHANGED;
|
|
|
|
goto mark_dir;
|
1997-04-29 20:15:03 +04:00
|
|
|
} else
|
1997-04-26 17:21:57 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-12-15 22:39:16 +03:00
|
|
|
if (p->ino == EXT2_RESIZE_INO) {
|
2008-08-28 07:07:54 +04:00
|
|
|
/*
|
2004-12-24 09:42:22 +03:00
|
|
|
* The resize inode has already be sanity checked
|
|
|
|
* during pass #0 (the superblock checks). All we
|
|
|
|
* have to do is mark the double indirect block as
|
|
|
|
* being in use; all of the other blocks are handled
|
|
|
|
* by mark_table_blocks()).
|
|
|
|
*/
|
|
|
|
if (blockcnt == BLOCK_COUNT_DIND)
|
2004-12-15 22:39:16 +03:00
|
|
|
mark_block_used(ctx, blk);
|
2011-07-11 00:25:55 +04:00
|
|
|
p->num_blocks++;
|
|
|
|
} else if (!(ctx->fs->cluster_ratio_bits &&
|
|
|
|
p->previous_block &&
|
|
|
|
(EXT2FS_B2C(ctx->fs, blk) ==
|
|
|
|
EXT2FS_B2C(ctx->fs, p->previous_block)) &&
|
|
|
|
(blk & EXT2FS_CLUSTER_MASK(ctx->fs)) ==
|
|
|
|
(blockcnt & EXT2FS_CLUSTER_MASK(ctx->fs)))) {
|
2004-12-15 22:39:16 +03:00
|
|
|
mark_block_used(ctx, blk);
|
2011-07-11 00:25:55 +04:00
|
|
|
p->num_blocks++;
|
|
|
|
}
|
1997-04-29 18:53:37 +04:00
|
|
|
if (blockcnt >= 0)
|
|
|
|
p->last_block = blockcnt;
|
2011-07-11 00:25:55 +04:00
|
|
|
p->previous_block = blk;
|
1997-04-26 17:58:21 +04:00
|
|
|
mark_dir:
|
1997-04-29 18:53:37 +04:00
|
|
|
if (p->is_dir && (blockcnt >= 0)) {
|
2009-11-28 17:35:37 +03:00
|
|
|
while (++p->last_db_block < blockcnt) {
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_add_dir_block2(fs->dblist,
|
|
|
|
p->ino, 0,
|
|
|
|
p->last_db_block);
|
2009-11-28 17:35:37 +03:00
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->blk = 0;
|
|
|
|
pctx->num = p->last_db_block;
|
|
|
|
goto failed_add_dir_block;
|
|
|
|
}
|
|
|
|
}
|
2010-06-14 01:00:00 +04:00
|
|
|
pctx->errcode = ext2fs_add_dir_block2(fs->dblist, p->ino,
|
|
|
|
blk, blockcnt);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx->errcode) {
|
|
|
|
pctx->blk = blk;
|
|
|
|
pctx->num = blockcnt;
|
2009-11-28 17:35:37 +03:00
|
|
|
failed_add_dir_block:
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
fix_problem(ctx, PR_1_ADD_DBLOCK, pctx);
|
1997-11-03 22:42:40 +03:00
|
|
|
/* Should never get here */
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return BLOCK_ABORT;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
}
|
1997-04-26 17:58:21 +04:00
|
|
|
return ret_code;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
2001-01-06 08:55:58 +03:00
|
|
|
static int process_bad_block(ext2_filsys fs,
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t *block_nr,
|
1998-06-11 00:45:22 +04:00
|
|
|
e2_blkcnt_t blockcnt,
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t ref_block EXT2FS_ATTR((unused)),
|
2003-12-07 09:28:50 +03:00
|
|
|
int ref_offset EXT2FS_ATTR((unused)),
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
void *priv_data)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
|
|
|
struct process_block_struct *p;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t blk = *block_nr;
|
|
|
|
blk64_t first_block;
|
2003-12-07 09:28:50 +03:00
|
|
|
dgrp_t i;
|
1997-04-29 20:15:03 +04:00
|
|
|
struct problem_context *pctx;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
e2fsck_t ctx;
|
1997-04-29 20:15:03 +04:00
|
|
|
|
Many files:
unix.c (main): If compression is enabled on the filesystem, print a
warning message (for now).
message.c: Add new compression shortcut: @c == compress
problem.c, problem.h (PR_1_COMPR_SET): Add new error code.
pass1.c (check_blocks): If the inode has EXT2_COMPRBLK_FL flag set,
check to see if the filesystem supports compression. If it does pass
this information down to process_block() so it can treat the
compressed block flag words correctly. If not, offer to clear the
flag, since it shouldn't be set.
(process_block): If an inode has the compressed inode flag set, allow
EXT2FS_COMPRESSED_BLKADDR.
pass1b.c (process_pass1b_block, delete_file_block, clone_file_block):
pass2.c (deallocate_inode_block): Use HOLE_BLKADDR to check to see if
the block can be skipped.
ChangeLog, Makefile.in:
Makefile.in: Exclude the internationalization files from being
distributed.
ChangeLog, configure, configure.in:
configure.in: Add support for --enable-compression. This is
experimental code only for now, which is why it's under --enable test.
Once it's stable, it will always be compiled in.
TODO:
Commit additional TODO items.
2000-02-11 18:55:07 +03:00
|
|
|
/*
|
|
|
|
* Note: This function processes blocks for the bad blocks
|
|
|
|
* inode, which is never compressed. So we don't use HOLE_BLKADDR().
|
|
|
|
*/
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
if (!blk)
|
|
|
|
return 0;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
p = (struct process_block_struct *) priv_data;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx = p->ctx;
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx = p->pctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
Many files:
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c: Add calls to the progress
indicator function.
pass1.c (scan_callback): Add call to the progress feedback function
(if it exists).
super.c (check_super_block): Skip the device size check if the
get_device_size returns EXT2_EXT_UNIMPLEMENTED.
iscan.c (main): Don't use fatal_error() anymore.
pass1b.c, swapfs.c, badblocks.c: Set E2F_FLAG_ABORT instead of calling
fatal_error(0).
problem.c, pass3.c (PR_3_ROOT_NOT_DIR_ABORT,
PR_3_NO_ROOT_INODE_ABORT): New problem codes.
problem.c, pass2.c (PR_2_SPLIT_DOT): New problem code.
problem.c, pass1.c (PR_1_SUPPRESS_MESSAGES): New problem code.
problemP.h: New file which separates out the private fix_problem data
structures.
util.c, dirinfo.c, pass1.c, pass1b.c, pass2.c, pass5.c, super.c,
swapfs.c util.c: allocate_memory() now takes a e2fsck context as its
first argument, and rename it to be e2fsck_allocate_memory().
problemP.h:
New file which contains the private problem abstraction definitions.
Makefile.pq:
Remove include of MAKEFILE.STD, which doesn't exist at this point.
1997-11-14 08:23:04 +03:00
|
|
|
pctx->ino = EXT2_BAD_INO;
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx->blk = blk;
|
|
|
|
pctx->blkcount = blockcnt;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
if ((blk < fs->super->s_first_data_block) ||
|
2009-09-08 04:46:34 +04:00
|
|
|
(blk >= ext2fs_blocks_count(fs->super))) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_BB_ILLEGAL_BLOCK_NUM, pctx)) {
|
1997-04-26 17:21:57 +04:00
|
|
|
*block_nr = 0;
|
|
|
|
return BLOCK_CHANGED;
|
1997-04-29 20:15:03 +04:00
|
|
|
} else
|
1997-04-26 17:21:57 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (blockcnt < 0) {
|
2009-08-23 06:29:02 +04:00
|
|
|
if (ext2fs_test_block_bitmap2(p->fs_meta_blocks, blk)) {
|
2003-11-21 18:41:58 +03:00
|
|
|
p->bbcheck = 1;
|
|
|
|
if (fix_problem(ctx, PR_1_BB_FS_BLOCK, pctx)) {
|
|
|
|
*block_nr = 0;
|
|
|
|
return BLOCK_CHANGED;
|
|
|
|
}
|
2009-08-23 06:29:02 +04:00
|
|
|
} else if (ext2fs_test_block_bitmap2(ctx->block_found_map,
|
2003-11-21 18:41:58 +03:00
|
|
|
blk)) {
|
|
|
|
p->bbcheck = 1;
|
2008-08-28 07:07:54 +04:00
|
|
|
if (fix_problem(ctx, PR_1_BBINODE_BAD_METABLOCK,
|
2003-11-21 18:41:58 +03:00
|
|
|
pctx)) {
|
|
|
|
*block_nr = 0;
|
|
|
|
return BLOCK_CHANGED;
|
|
|
|
}
|
1998-02-24 23:22:23 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
1997-11-03 22:42:40 +03:00
|
|
|
return BLOCK_ABORT;
|
|
|
|
} else
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
mark_block_used(ctx, blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
#if 0
|
1997-04-26 17:58:21 +04:00
|
|
|
printf ("DEBUG: Marking %u as bad.\n", blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
#endif
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->fs_badblocks_count++;
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* If the block is not used, then mark it as used and return.
|
|
|
|
* If it is already marked as found, this must mean that
|
|
|
|
* there's an overlap between the filesystem table blocks
|
|
|
|
* (bitmaps and inode table) and the bad block list.
|
|
|
|
*/
|
2009-08-23 06:29:02 +04:00
|
|
|
if (!ext2fs_test_block_bitmap2(ctx->block_found_map, blk)) {
|
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map, blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
return 0;
|
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
/*
|
|
|
|
* Try to find the where the filesystem block was used...
|
|
|
|
*/
|
|
|
|
first_block = fs->super->s_first_data_block;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
for (i = 0; i < fs->group_desc_count; i++ ) {
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx->group = i;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx->blk = blk;
|
1997-11-20 00:39:13 +03:00
|
|
|
if (!ext2fs_bg_has_super(fs, i))
|
|
|
|
goto skip_super;
|
1997-04-26 17:34:30 +04:00
|
|
|
if (blk == first_block) {
|
|
|
|
if (i == 0) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx,
|
|
|
|
PR_1_BAD_PRIMARY_SUPERBLOCK,
|
|
|
|
pctx)) {
|
|
|
|
*block_nr = 0;
|
1997-04-26 17:58:21 +04:00
|
|
|
return BLOCK_CHANGED;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
}
|
1997-04-26 17:58:21 +04:00
|
|
|
return 0;
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
fix_problem(ctx, PR_1_BAD_SUPERBLOCK, pctx);
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if ((blk > first_block) &&
|
|
|
|
(blk <= first_block + fs->desc_blocks)) {
|
|
|
|
if (i == 0) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx->blk = *block_nr;
|
|
|
|
if (fix_problem(ctx,
|
|
|
|
PR_1_BAD_PRIMARY_GROUP_DESCRIPTOR, pctx)) {
|
|
|
|
*block_nr = 0;
|
1997-04-26 17:58:21 +04:00
|
|
|
return BLOCK_CHANGED;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
}
|
1997-04-26 17:58:21 +04:00
|
|
|
return 0;
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
fix_problem(ctx, PR_1_BAD_GROUP_DESCRIPTORS, pctx);
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
1997-11-20 00:39:13 +03:00
|
|
|
skip_super:
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (blk == ext2fs_block_bitmap_loc(fs, i)) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_BB_BAD_BLOCK, pctx)) {
|
|
|
|
ctx->invalid_block_bitmap_flag[i]++;
|
|
|
|
ctx->invalid_bitmaps++;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
|
|
|
}
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (blk == ext2fs_inode_bitmap_loc(fs, i)) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_IB_BAD_BLOCK, pctx)) {
|
|
|
|
ctx->invalid_inode_bitmap_flag[i]++;
|
|
|
|
ctx->invalid_bitmaps++;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
|
|
|
}
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if ((blk >= ext2fs_inode_table_loc(fs, i)) &&
|
|
|
|
(blk < (ext2fs_inode_table_loc(fs, i) +
|
1997-04-26 17:34:30 +04:00
|
|
|
fs->inode_blocks_per_group))) {
|
1997-04-29 20:15:03 +04:00
|
|
|
/*
|
|
|
|
* If there are bad blocks in the inode table,
|
|
|
|
* the inode scan code will try to do
|
|
|
|
* something reasonable automatically.
|
|
|
|
*/
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
|
|
|
}
|
1997-11-20 00:39:13 +03:00
|
|
|
first_block += fs->super->s_blocks_per_group;
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If we've gotten to this point, then the only
|
|
|
|
* possibility is that the bad block inode meta data
|
|
|
|
* is using a bad block.
|
|
|
|
*/
|
|
|
|
if ((blk == p->inode->i_block[EXT2_IND_BLOCK]) ||
|
2003-11-21 18:41:58 +03:00
|
|
|
(blk == p->inode->i_block[EXT2_DIND_BLOCK]) ||
|
|
|
|
(blk == p->inode->i_block[EXT2_TIND_BLOCK])) {
|
|
|
|
p->bbcheck = 1;
|
|
|
|
if (fix_problem(ctx, PR_1_BBINODE_BAD_METABLOCK, pctx)) {
|
|
|
|
*block_nr = 0;
|
|
|
|
return BLOCK_CHANGED;
|
|
|
|
}
|
1998-02-24 23:22:23 +03:00
|
|
|
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
|
1997-11-03 22:42:40 +03:00
|
|
|
return BLOCK_ABORT;
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
|
|
|
|
pctx->group = -1;
|
|
|
|
|
|
|
|
/* Warn user that the block wasn't claimed */
|
|
|
|
fix_problem(ctx, PR_1_PROGERR_CLAIMED_BLOCK, pctx);
|
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
return 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
2008-08-28 07:07:54 +04:00
|
|
|
static void new_table_block(e2fsck_t ctx, blk_t first_block, int group,
|
2009-08-23 06:29:02 +04:00
|
|
|
const char *name, int num, blk64_t *new_block)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ext2_filsys fs = ctx->fs;
|
2009-08-19 06:27:42 +04:00
|
|
|
dgrp_t last_grp;
|
2009-08-23 06:29:02 +04:00
|
|
|
blk64_t old_block = *new_block;
|
|
|
|
blk64_t last_block;
|
2009-08-19 06:27:42 +04:00
|
|
|
int i, is_flexbg, flexbg, flexbg_size;
|
1997-04-26 17:21:57 +04:00
|
|
|
char *buf;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
struct problem_context pctx;
|
|
|
|
|
|
|
|
clear_problem_context(&pctx);
|
|
|
|
|
|
|
|
pctx.group = group;
|
|
|
|
pctx.blk = old_block;
|
|
|
|
pctx.str = name;
|
|
|
|
|
2009-08-19 06:27:42 +04:00
|
|
|
/*
|
|
|
|
* For flex_bg filesystems, first try to allocate the metadata
|
|
|
|
* within the flex_bg, and if that fails then try finding the
|
|
|
|
* space anywhere in the filesystem.
|
|
|
|
*/
|
|
|
|
is_flexbg = EXT2_HAS_INCOMPAT_FEATURE(fs->super,
|
|
|
|
EXT4_FEATURE_INCOMPAT_FLEX_BG);
|
|
|
|
if (is_flexbg) {
|
|
|
|
flexbg_size = 1 << fs->super->s_log_groups_per_flex;
|
|
|
|
flexbg = group / flexbg_size;
|
2009-10-26 04:24:06 +03:00
|
|
|
first_block = ext2fs_group_first_block2(fs,
|
|
|
|
flexbg_size * flexbg);
|
2009-08-19 06:27:42 +04:00
|
|
|
last_grp = group | (flexbg_size - 1);
|
|
|
|
if (last_grp > fs->group_desc_count)
|
|
|
|
last_grp = fs->group_desc_count;
|
2009-10-26 04:24:06 +03:00
|
|
|
last_block = ext2fs_group_last_block2(fs, last_grp);
|
2009-08-19 06:27:42 +04:00
|
|
|
} else
|
2009-10-26 04:24:06 +03:00
|
|
|
last_block = ext2fs_group_last_block2(fs, group);
|
2009-08-23 06:29:02 +04:00
|
|
|
pctx.errcode = ext2fs_get_free_blocks2(fs, first_block, last_block,
|
|
|
|
num, ctx->block_found_map,
|
|
|
|
new_block);
|
2009-08-19 06:27:42 +04:00
|
|
|
if (is_flexbg && (pctx.errcode == EXT2_ET_BLOCK_ALLOC_FAIL))
|
2009-08-23 06:29:02 +04:00
|
|
|
pctx.errcode = ext2fs_get_free_blocks2(fs,
|
2009-08-19 06:27:42 +04:00
|
|
|
fs->super->s_first_data_block,
|
2009-09-08 04:46:34 +04:00
|
|
|
ext2fs_blocks_count(fs->super),
|
2009-08-19 06:27:42 +04:00
|
|
|
num, ctx->block_found_map, new_block);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.num = num;
|
|
|
|
fix_problem(ctx, PR_1_RELOC_BLOCK_ALLOCATE, &pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
ext2fs_unmark_valid(fs);
|
2009-08-19 06:27:42 +04:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
1997-04-26 17:21:57 +04:00
|
|
|
return;
|
|
|
|
}
|
2003-08-01 17:41:07 +04:00
|
|
|
pctx.errcode = ext2fs_get_mem(fs->blocksize, &buf);
|
1997-11-03 22:42:40 +03:00
|
|
|
if (pctx.errcode) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
fix_problem(ctx, PR_1_RELOC_MEMORY_ALLOCATE, &pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
ext2fs_unmark_valid(fs);
|
2009-08-19 06:27:42 +04:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
1997-04-26 17:21:57 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
2002-11-08 19:10:28 +03:00
|
|
|
fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx.blk2 = *new_block;
|
|
|
|
fix_problem(ctx, (old_block ? PR_1_RELOC_FROM_TO :
|
|
|
|
PR_1_RELOC_TO), &pctx);
|
|
|
|
pctx.blk2 = 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
for (i = 0; i < num; i++) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx.blk = i;
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map, (*new_block)+i);
|
1997-04-26 17:34:30 +04:00
|
|
|
if (old_block) {
|
2009-09-08 05:14:24 +04:00
|
|
|
pctx.errcode = io_channel_read_blk64(fs->io,
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
old_block + i, 1, buf);
|
|
|
|
if (pctx.errcode)
|
|
|
|
fix_problem(ctx, PR_1_RELOC_READ_ERR, &pctx);
|
1997-04-26 17:34:30 +04:00
|
|
|
} else
|
|
|
|
memset(buf, 0, fs->blocksize);
|
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
pctx.blk = (*new_block) + i;
|
2009-09-08 05:14:24 +04:00
|
|
|
pctx.errcode = io_channel_write_blk64(fs->io, pctx.blk,
|
1997-04-26 17:21:57 +04:00
|
|
|
1, buf);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (pctx.errcode)
|
|
|
|
fix_problem(ctx, PR_1_RELOC_WRITE_ERR, &pctx);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&buf);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1997-04-26 17:34:30 +04:00
|
|
|
* This routine gets called at the end of pass 1 if bad blocks are
|
|
|
|
* detected in the superblock, group descriptors, inode_bitmaps, or
|
|
|
|
* block bitmaps. At this point, all of the blocks have been mapped
|
|
|
|
* out, so we can try to allocate new block(s) to replace the bad
|
|
|
|
* blocks.
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void handle_fs_bad_blocks(e2fsck_t ctx)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ext2_filsys fs = ctx->fs;
|
2003-12-07 09:28:50 +03:00
|
|
|
dgrp_t i;
|
2009-08-23 06:29:02 +04:00
|
|
|
blk64_t first_block;
|
|
|
|
blk64_t new_blk;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
for (i = 0; i < fs->group_desc_count; i++) {
|
2009-10-26 04:24:06 +03:00
|
|
|
first_block = ext2fs_group_first_block2(fs, i);
|
2006-09-12 22:56:16 +04:00
|
|
|
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (ctx->invalid_block_bitmap_flag[i]) {
|
2009-08-23 06:29:02 +04:00
|
|
|
new_blk = ext2fs_block_bitmap_loc(fs, i);
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
new_table_block(ctx, first_block, i, _("block bitmap"),
|
2009-08-23 06:29:02 +04:00
|
|
|
1, &new_blk);
|
|
|
|
ext2fs_block_bitmap_loc_set(fs, i, new_blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (ctx->invalid_inode_bitmap_flag[i]) {
|
2009-08-23 06:29:02 +04:00
|
|
|
new_blk = ext2fs_inode_bitmap_loc(fs, i);
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
new_table_block(ctx, first_block, i, _("inode bitmap"),
|
2009-08-23 06:29:02 +04:00
|
|
|
1, &new_blk);
|
|
|
|
ext2fs_inode_bitmap_loc_set(fs, i, new_blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (ctx->invalid_inode_table_flag[i]) {
|
2009-08-23 06:29:02 +04:00
|
|
|
new_blk = ext2fs_inode_table_loc(fs, i);
|
Many files:
badblocks.c, e2fsck.h, ehandler.c, emptydir.c, extend.c, flushb.c,
iscan.c, message.c, pass1.c, pass1b.c, pass3.c pass4.c, pass5.c,
problem.c, scantest.c, swapfs.c, unix.c, util.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-07 06:11:03 +03:00
|
|
|
new_table_block(ctx, first_block, i, _("inode table"),
|
2008-08-28 07:07:54 +04:00
|
|
|
fs->inode_blocks_per_group,
|
2009-08-23 06:29:02 +04:00
|
|
|
&new_blk);
|
|
|
|
ext2fs_inode_table_loc_set(fs, i, new_blk);
|
1997-11-03 22:42:40 +03:00
|
|
|
ctx->flags |= E2F_FLAG_RESTART;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
}
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->invalid_bitmaps = 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This routine marks all blocks which are used by the superblock,
|
|
|
|
* group descriptors, inode bitmaps, and block bitmaps.
|
|
|
|
*/
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
static void mark_table_blocks(e2fsck_t ctx)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ext2_filsys fs = ctx->fs;
|
2010-06-14 01:00:00 +04:00
|
|
|
blk64_t b;
|
2003-12-07 09:28:50 +03:00
|
|
|
dgrp_t i;
|
|
|
|
int j;
|
1997-04-29 20:15:03 +04:00
|
|
|
struct problem_context pctx;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-29 20:15:03 +04:00
|
|
|
clear_problem_context(&pctx);
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
for (i = 0; i < fs->group_desc_count; i++) {
|
1997-04-29 20:15:03 +04:00
|
|
|
pctx.group = i;
|
1997-06-12 08:28:07 +04:00
|
|
|
|
2003-11-21 17:02:21 +03:00
|
|
|
ext2fs_reserve_super_and_bgd(fs, i, ctx->block_found_map);
|
|
|
|
|
1997-04-29 20:15:03 +04:00
|
|
|
/*
|
|
|
|
* Mark the blocks used for the inode table
|
|
|
|
*/
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (ext2fs_inode_table_loc(fs, i)) {
|
|
|
|
for (j = 0, b = ext2fs_inode_table_loc(fs, i);
|
1997-04-29 20:15:03 +04:00
|
|
|
j < fs->inode_blocks_per_group;
|
|
|
|
j++, b++) {
|
2009-08-23 06:29:02 +04:00
|
|
|
if (ext2fs_test_block_bitmap2(ctx->block_found_map,
|
1997-04-29 20:15:03 +04:00
|
|
|
b)) {
|
|
|
|
pctx.blk = b;
|
2009-08-19 07:14:03 +04:00
|
|
|
if (!ctx->invalid_inode_table_flag[i] &&
|
|
|
|
fix_problem(ctx,
|
1997-04-29 20:15:03 +04:00
|
|
|
PR_1_ITABLE_CONFLICT, &pctx)) {
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
ctx->invalid_inode_table_flag[i]++;
|
|
|
|
ctx->invalid_bitmaps++;
|
1997-04-29 20:15:03 +04:00
|
|
|
}
|
|
|
|
} else {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map,
|
1997-04-29 20:15:03 +04:00
|
|
|
b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
2008-08-28 07:07:54 +04:00
|
|
|
* Mark block used for the block bitmap
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (ext2fs_block_bitmap_loc(fs, i)) {
|
2009-08-23 06:29:02 +04:00
|
|
|
if (ext2fs_test_block_bitmap2(ctx->block_found_map,
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
ext2fs_block_bitmap_loc(fs, i))) {
|
|
|
|
pctx.blk = ext2fs_block_bitmap_loc(fs, i);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_BB_CONFLICT, &pctx)) {
|
|
|
|
ctx->invalid_block_bitmap_flag[i]++;
|
|
|
|
ctx->invalid_bitmaps++;
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
1997-04-26 17:58:21 +04:00
|
|
|
} else {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map,
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
ext2fs_block_bitmap_loc(fs, i));
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
2008-08-28 07:07:54 +04:00
|
|
|
* Mark block used for the inode bitmap
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
if (ext2fs_inode_bitmap_loc(fs, i)) {
|
2009-08-23 06:29:02 +04:00
|
|
|
if (ext2fs_test_block_bitmap2(ctx->block_found_map,
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
ext2fs_inode_bitmap_loc(fs, i))) {
|
|
|
|
pctx.blk = ext2fs_inode_bitmap_loc(fs, i);
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
if (fix_problem(ctx, PR_1_IB_CONFLICT, &pctx)) {
|
|
|
|
ctx->invalid_inode_bitmap_flag[i]++;
|
|
|
|
ctx->invalid_bitmaps++;
|
2008-08-28 07:07:54 +04:00
|
|
|
}
|
1997-04-26 17:58:21 +04:00
|
|
|
} else {
|
2009-08-23 06:29:02 +04:00
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map,
|
Convert to use block group accessor functions
Convert direct accesses to use the following block group accessor
functions: ext2fs_block_bitmap_loc(), ext2fs_inode_bitmap_loc(),
ext2fs_inode_table_loc(), ext2fs_bg_itable_unused(),
ext2fs_block_bitmap_loc_set(), ext2fs_inode_bitmap_loc_set(),
ext2fs_inode_table_loc_set(), ext2fs_bg_free_inodes_count(),
ext2fs_ext2fs_bg_used_dirs_count(), ext2fs_bg_free_inodes_count_set(),
ext2fs_bg_free_blocks_count_set(), ext2fs_bg_used_dirs_count_set()
Signed-off-by: Valerie Aurora Henson <vaurora@redhat.com>
Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2009-10-26 04:43:47 +03:00
|
|
|
ext2fs_inode_bitmap_loc(fs, i));
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
* Thes subroutines short circuits ext2fs_get_blocks and
|
1997-04-26 17:21:57 +04:00
|
|
|
* ext2fs_check_directory; we use them since we already have the inode
|
|
|
|
* structure, so there's no point in letting the ext2fs library read
|
|
|
|
* the inode again.
|
|
|
|
*/
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
static errcode_t pass1_get_blocks(ext2_filsys fs, ext2_ino_t ino,
|
|
|
|
blk_t *blocks)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
|
1997-04-26 17:21:57 +04:00
|
|
|
int i;
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2001-06-01 23:29:36 +04:00
|
|
|
if ((ino != ctx->stashed_ino) || !ctx->stashed_inode)
|
1997-04-29 21:48:10 +04:00
|
|
|
return EXT2_ET_CALLBACK_NOTHANDLED;
|
|
|
|
|
|
|
|
for (i=0; i < EXT2_N_BLOCKS; i++)
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
blocks[i] = ctx->stashed_inode->i_block[i];
|
1997-04-29 21:48:10 +04:00
|
|
|
return 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
static errcode_t pass1_read_inode(ext2_filsys fs, ext2_ino_t ino,
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
struct ext2_inode *inode)
|
1997-04-29 18:53:37 +04:00
|
|
|
{
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
|
2001-06-01 23:29:36 +04:00
|
|
|
if ((ino != ctx->stashed_ino) || !ctx->stashed_inode)
|
1997-04-29 18:53:37 +04:00
|
|
|
return EXT2_ET_CALLBACK_NOTHANDLED;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
*inode = *ctx->stashed_inode;
|
1997-04-29 18:53:37 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
static errcode_t pass1_write_inode(ext2_filsys fs, ext2_ino_t ino,
|
1997-04-29 18:53:37 +04:00
|
|
|
struct ext2_inode *inode)
|
|
|
|
{
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
|
2005-07-25 20:36:43 +04:00
|
|
|
if ((ino == ctx->stashed_ino) && ctx->stashed_inode &&
|
|
|
|
(inode != ctx->stashed_inode))
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
*ctx->stashed_inode = *inode;
|
1997-04-29 18:53:37 +04:00
|
|
|
return EXT2_ET_CALLBACK_NOTHANDLED;
|
|
|
|
}
|
|
|
|
|
Many files:
dirinfo.c, e2fsck.h, emptydir.c, iscan.c, jfs_user.h, journal.c,
message.c, pass1.c, pass1b.c, pass2.c, pass3.c, pass4.c, pass5.c,
problem.h, scantest.c, super.c, swapfs.c: Change ino_t to ext2_ino_t.
2001-01-11 18:12:14 +03:00
|
|
|
static errcode_t pass1_check_directory(ext2_filsys fs, ext2_ino_t ino)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
e2fsck.h: If EXT2_FLAT_INCLUDES is defined, then assume all of
the ext2-specific header files are in a flat directory.
dirinfo.c, ehandler.c, pass1.c, pass1b.c, pass2.c, pass5.c,
super.c, swapfs.c, unix.c: Explicitly cast all assignments
from void * to be compatible with C++.
unix.c (sync_disk): Remove sync_disk and calls to that function,
since ext2fs_close() now takes care of this.
pass1.c, pass1b.c, pass2.c, pass3.c, swapfs, badblocks.c,
ehandler.c, unix.c: Change use of private to be priv_data, to
avoid C++ reserved name clash.
1998-01-19 17:50:49 +03:00
|
|
|
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
|
2001-06-01 23:29:36 +04:00
|
|
|
if ((ino != ctx->stashed_ino) || !ctx->stashed_inode)
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
return EXT2_ET_CALLBACK_NOTHANDLED;
|
|
|
|
|
|
|
|
if (!LINUX_S_ISDIR(ctx->stashed_inode->i_mode))
|
1997-10-31 09:17:08 +03:00
|
|
|
return EXT2_ET_NO_DIRECTORY;
|
Many files:
pass*.c, super.c: Massive changes to avoid using printf and com_err
routines. All diagnostic messages are now routed through the
fix_problem interface.
pass2.c (check_dir_block): Check for duplicate '.' and '..' entries.
problem.c, problem.h: Add new problem codes PR_2_DUP_DOT and
PR_2_DUP_DOT_DOT.
problem.c: Added new problem codes for some of the superblock
corruption checks, and for the pass header messages. ("Pass
1: xxxxx")
util.c (print_resource_track): Now takes a description argument.
super.c, unix.c, e2fsck.c: New files to separate out the
operating-specific operations out from e2fsck.c. e2fsck.c now
contains the global e2fsck context management routines, and
super.c contains the "pass 0" initial validation of the
superblock and global block group descriptors.
pass1.c, pass2.c, pass3.c, pass4.c, pass5.c, util.c: Eliminate
(nearly) all global variables and moved them to the e2fsck
context structure.
problem.c, problem.h: Added new problem codes PR_0_SB_CORRUPT,
PR_0_FS_SIZE_WRONG, PR_0_NO_FRAGMENTS, PR_0_BLOCKS_PER_GROUP,
PR_0_FIRST_DATA_BLOCK
expect.1, expect.2:
Updated tests to align with e2fsck problem.c changes.
1997-10-03 21:48:10 +04:00
|
|
|
return 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
|
2008-06-03 01:27:59 +04:00
|
|
|
static errcode_t e2fsck_get_alloc_block(ext2_filsys fs, blk64_t goal,
|
|
|
|
blk64_t *ret)
|
|
|
|
{
|
|
|
|
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
|
|
|
|
errcode_t retval;
|
2009-08-23 06:29:02 +04:00
|
|
|
blk64_t new_block;
|
2008-06-03 01:27:59 +04:00
|
|
|
|
|
|
|
if (ctx->block_found_map) {
|
2010-01-31 05:15:36 +03:00
|
|
|
retval = ext2fs_new_block2(fs, goal, ctx->block_found_map,
|
|
|
|
&new_block);
|
2008-06-03 01:27:59 +04:00
|
|
|
if (retval)
|
|
|
|
return retval;
|
2009-11-29 09:24:06 +03:00
|
|
|
if (fs->block_map) {
|
2010-01-31 05:22:17 +03:00
|
|
|
ext2fs_mark_block_bitmap2(fs->block_map, new_block);
|
2009-11-29 09:24:06 +03:00
|
|
|
ext2fs_mark_bb_dirty(fs);
|
|
|
|
}
|
2008-06-03 01:27:59 +04:00
|
|
|
} else {
|
|
|
|
if (!fs->block_map) {
|
|
|
|
retval = ext2fs_read_block_bitmap(fs);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2010-01-31 05:15:36 +03:00
|
|
|
retval = ext2fs_new_block2(fs, goal, 0, &new_block);
|
2008-06-03 01:27:59 +04:00
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
}
|
2008-08-28 07:07:54 +04:00
|
|
|
|
2008-06-03 01:27:59 +04:00
|
|
|
*ret = new_block;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void e2fsck_block_alloc_stats(ext2_filsys fs, blk64_t blk, int inuse)
|
|
|
|
{
|
|
|
|
e2fsck_t ctx = (e2fsck_t) fs->priv_data;
|
|
|
|
|
|
|
|
if (ctx->block_found_map) {
|
|
|
|
if (inuse > 0)
|
2010-01-31 05:15:36 +03:00
|
|
|
ext2fs_mark_block_bitmap2(ctx->block_found_map, blk);
|
2008-06-03 01:27:59 +04:00
|
|
|
else
|
2010-01-31 05:15:36 +03:00
|
|
|
ext2fs_unmark_block_bitmap2(ctx->block_found_map, blk);
|
2008-06-03 01:27:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool)
|
|
|
|
{
|
|
|
|
ext2_filsys fs = ctx->fs;
|
|
|
|
|
|
|
|
if (bool) {
|
|
|
|
fs->get_blocks = pass1_get_blocks;
|
|
|
|
fs->check_directory = pass1_check_directory;
|
|
|
|
fs->read_inode = pass1_read_inode;
|
|
|
|
fs->write_inode = pass1_write_inode;
|
|
|
|
ctx->stashed_ino = 0;
|
2008-06-03 01:27:59 +04:00
|
|
|
ext2fs_set_alloc_block_callback(fs, e2fsck_get_alloc_block,
|
|
|
|
0);
|
|
|
|
ext2fs_set_block_alloc_stats_callback(fs,
|
|
|
|
e2fsck_block_alloc_stats,
|
|
|
|
0);
|
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).
1999-06-25 19:40:18 +04:00
|
|
|
} else {
|
|
|
|
fs->get_blocks = 0;
|
|
|
|
fs->check_directory = 0;
|
|
|
|
fs->read_inode = 0;
|
|
|
|
fs->write_inode = 0;
|
|
|
|
}
|
|
|
|
}
|