1997-04-26 21:21:57 +08:00
|
|
|
/*
|
|
|
|
* pass1b.c --- Pass #1b of e2fsck
|
|
|
|
*
|
|
|
|
* This file contains pass1B, pass1C, and pass1D of e2fsck. They are
|
|
|
|
* only invoked if pass 1 discovered blocks which are in use by more
|
|
|
|
* than one inode.
|
|
|
|
*
|
|
|
|
* Pass1B scans the data blocks of all the inodes again, generating a
|
|
|
|
* complete list of duplicate blocks and which inodes have claimed
|
|
|
|
* them.
|
|
|
|
*
|
|
|
|
* Pass1C does a tree-traversal of the filesystem, to determine the
|
|
|
|
* parent directories of these inodes. This step is necessary so that
|
|
|
|
* e2fsck can print out the pathnames of affected inodes.
|
|
|
|
*
|
|
|
|
* Pass1D is a reconciliation pass. For each inode with duplicate
|
|
|
|
* blocks, the user is prompted if s/he would like to clone the file
|
|
|
|
* (so that the file gets a fresh copy of the duplicated blocks) or
|
|
|
|
* simply to delete the file.
|
|
|
|
*
|
1997-04-30 00:15:03 +08: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%
|
1997-04-26 21:21:57 +08:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <time.h>
|
1997-04-26 21:58:21 +08:00
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2003-08-02 02:26:23 +08:00
|
|
|
#ifdef HAVE_INTTYPES_H
|
|
|
|
#include <inttypes.h>
|
|
|
|
#endif
|
|
|
|
|
2005-01-09 13:57:45 +08:00
|
|
|
#ifndef HAVE_INTPTR_T
|
|
|
|
typedef long intptr_t
|
|
|
|
#endif
|
|
|
|
|
2003-08-02 02:26:23 +08:00
|
|
|
/* Needed for architectures where sizeof(int) != sizeof(void *) */
|
|
|
|
#define INT_TO_VOIDPTR(val) ((void *)(intptr_t)(val))
|
|
|
|
#define VOIDPTR_TO_INT(ptr) ((int)(intptr_t)(ptr))
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
#include <et/com_err.h>
|
|
|
|
#include "e2fsck.h"
|
|
|
|
|
1997-04-30 00:15:03 +08:00
|
|
|
#include "problem.h"
|
2002-08-02 00:37:00 +08:00
|
|
|
#include "dict.h"
|
1997-04-30 00:15:03 +08:00
|
|
|
|
2001-07-02 23:54:09 +08:00
|
|
|
/* Define an extension to the ext2 library's block count information */
|
|
|
|
#define BLOCK_COUNT_EXTATTR (-5)
|
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
struct block_el {
|
|
|
|
blk_t block;
|
|
|
|
struct block_el *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct inode_el {
|
|
|
|
ext2_ino_t inode;
|
|
|
|
struct inode_el *next;
|
|
|
|
};
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
struct dup_block {
|
|
|
|
int num_bad;
|
2002-08-02 00:37:00 +08:00
|
|
|
struct inode_el *inode_list;
|
1997-04-26 21:21:57 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This structure stores information about a particular inode which
|
|
|
|
* is sharing blocks with other inodes. This information is collected
|
|
|
|
* to display to the user, so that the user knows what files he or she
|
|
|
|
* is dealing with, when trying to decide how to resolve the conflict
|
|
|
|
* of multiply-claimed blocks.
|
|
|
|
*/
|
|
|
|
struct dup_inode {
|
2002-08-02 00:37:00 +08:00
|
|
|
ext2_ino_t dir;
|
1997-04-30 00:15:03 +08:00
|
|
|
int num_dupblocks;
|
|
|
|
struct ext2_inode inode;
|
2002-08-02 00:37:00 +08:00
|
|
|
struct block_el *block_list;
|
1997-04-26 21:21:57 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int process_pass1b_block(ext2_filsys fs, blk_t *blocknr,
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
e2_blkcnt_t blockcnt, blk_t ref_blk,
|
|
|
|
int ref_offset, void *priv_data);
|
2002-08-02 00:37:00 +08:00
|
|
|
static void delete_file(e2fsck_t ctx, ext2_ino_t ino,
|
|
|
|
struct dup_inode *dp, char *block_buf);
|
|
|
|
static int clone_file(e2fsck_t ctx, ext2_ino_t ino,
|
|
|
|
struct dup_inode *dp, char* block_buf);
|
2000-02-09 07:19:32 +08:00
|
|
|
static int check_if_fs_block(e2fsck_t ctx, blk_t test_blk);
|
|
|
|
|
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-04 01:48:10 +08:00
|
|
|
static void pass1b(e2fsck_t ctx, char *block_buf);
|
|
|
|
static void pass1c(e2fsck_t ctx, char *block_buf);
|
|
|
|
static void pass1d(e2fsck_t ctx, char *block_buf);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
|
|
|
static int dup_inode_count = 0;
|
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
static dict_t blk_dict, ino_dict;
|
|
|
|
|
1997-04-26 21:34:30 +08:00
|
|
|
static ext2fs_inode_bitmap inode_dup_map;
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
static int dict_int_cmp(const void *a, const void *b)
|
|
|
|
{
|
2003-08-02 02:26:23 +08:00
|
|
|
intptr_t ia, ib;
|
2002-08-02 00:37:00 +08:00
|
|
|
|
2003-08-02 02:26:23 +08:00
|
|
|
ia = (intptr_t)a;
|
|
|
|
ib = (intptr_t)b;
|
2002-08-02 00:37:00 +08:00
|
|
|
|
|
|
|
return (ia-ib);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a duplicate block record
|
|
|
|
*/
|
|
|
|
static void add_dupe(e2fsck_t ctx, ext2_ino_t ino, blk_t blk,
|
|
|
|
struct ext2_inode *inode)
|
|
|
|
{
|
|
|
|
dnode_t *n;
|
|
|
|
struct dup_block *db;
|
|
|
|
struct dup_inode *di;
|
|
|
|
struct block_el *blk_el;
|
|
|
|
struct inode_el *ino_el;
|
|
|
|
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&blk_dict, INT_TO_VOIDPTR(blk));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (n)
|
|
|
|
db = (struct dup_block *) dnode_get(n);
|
|
|
|
else {
|
|
|
|
db = (struct dup_block *) e2fsck_allocate_memory(ctx,
|
|
|
|
sizeof(struct dup_block), "duplicate block header");
|
|
|
|
db->num_bad = 0;
|
|
|
|
db->inode_list = 0;
|
2003-08-02 02:26:23 +08:00
|
|
|
dict_alloc_insert(&blk_dict, INT_TO_VOIDPTR(blk), db);
|
2002-08-02 00:37:00 +08:00
|
|
|
}
|
|
|
|
ino_el = (struct inode_el *) e2fsck_allocate_memory(ctx,
|
|
|
|
sizeof(struct inode_el), "inode element");
|
|
|
|
ino_el->inode = ino;
|
|
|
|
ino_el->next = db->inode_list;
|
|
|
|
db->inode_list = ino_el;
|
|
|
|
db->num_bad++;
|
|
|
|
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&ino_dict, INT_TO_VOIDPTR(ino));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (n)
|
|
|
|
di = (struct dup_inode *) dnode_get(n);
|
|
|
|
else {
|
|
|
|
di = (struct dup_inode *) e2fsck_allocate_memory(ctx,
|
|
|
|
sizeof(struct dup_inode), "duplicate inode header");
|
|
|
|
di->dir = (ino == EXT2_ROOT_INO) ? EXT2_ROOT_INO : 0 ;
|
|
|
|
di->num_dupblocks = 0;
|
|
|
|
di->block_list = 0;
|
|
|
|
di->inode = *inode;
|
2003-08-02 02:26:23 +08:00
|
|
|
dict_alloc_insert(&ino_dict, INT_TO_VOIDPTR(ino), di);
|
2002-08-02 00:37:00 +08:00
|
|
|
}
|
|
|
|
blk_el = (struct block_el *) e2fsck_allocate_memory(ctx,
|
|
|
|
sizeof(struct block_el), "block element");
|
|
|
|
blk_el->block = blk;
|
|
|
|
blk_el->next = di->block_list;
|
|
|
|
di->block_list = blk_el;
|
|
|
|
di->num_dupblocks++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Free a duplicate inode record
|
|
|
|
*/
|
2003-12-07 14:28:50 +08:00
|
|
|
static void inode_dnode_free(dnode_t *node,
|
|
|
|
void *context EXT2FS_ATTR((unused)))
|
2002-08-02 00:37:00 +08:00
|
|
|
{
|
|
|
|
struct dup_inode *di;
|
|
|
|
struct block_el *p, *next;
|
|
|
|
|
|
|
|
di = (struct dup_inode *) dnode_get(node);
|
|
|
|
for (p = di->block_list; p; p = next) {
|
|
|
|
next = p->next;
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
free(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Free a duplicate block record
|
|
|
|
*/
|
2003-12-07 14:28:50 +08:00
|
|
|
static void block_dnode_free(dnode_t *node,
|
|
|
|
void *context EXT2FS_ATTR((unused)))
|
2002-08-02 00:37:00 +08:00
|
|
|
{
|
|
|
|
struct dup_block *db;
|
|
|
|
struct inode_el *p, *next;
|
|
|
|
|
|
|
|
db = (struct dup_block *) dnode_get(node);
|
|
|
|
for (p = db->inode_list; p; p = next) {
|
|
|
|
next = p->next;
|
|
|
|
free(p);
|
|
|
|
}
|
|
|
|
free(node);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
/*
|
|
|
|
* Main procedure for handling duplicate blocks
|
|
|
|
*/
|
1997-11-04 03:42:40 +08:00
|
|
|
void e2fsck_pass1_dupblocks(e2fsck_t ctx, char *block_buf)
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ext2_filsys fs = ctx->fs;
|
|
|
|
struct problem_context pctx;
|
|
|
|
|
|
|
|
clear_problem_context(&pctx);
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08: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 11:11:03 +08:00
|
|
|
_("multiply claimed inode map"), &inode_dup_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-04 01:48:10 +08:00
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1B_ALLOCATE_IBITMAP_ERROR, &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 13:23:04 +08:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
2002-08-02 00:37:00 +08:00
|
|
|
|
|
|
|
dict_init(&ino_dict, DICTCOUNT_T_MAX, dict_int_cmp);
|
|
|
|
dict_init(&blk_dict, DICTCOUNT_T_MAX, dict_int_cmp);
|
|
|
|
dict_set_allocator(&ino_dict, NULL, inode_dnode_free, NULL);
|
|
|
|
dict_set_allocator(&blk_dict, NULL, block_dnode_free, NULL);
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
pass1b(ctx, block_buf);
|
|
|
|
pass1c(ctx, block_buf);
|
|
|
|
pass1d(ctx, block_buf);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Time to free all of the accumulated data structures that we
|
|
|
|
* don't need anymore.
|
|
|
|
*/
|
2002-08-02 00:37:00 +08:00
|
|
|
dict_free_nodes(&ino_dict);
|
|
|
|
dict_free_nodes(&blk_dict);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan the inodes looking for inodes that contain duplicate blocks.
|
|
|
|
*/
|
|
|
|
struct process_block_struct {
|
2002-08-02 00:37:00 +08:00
|
|
|
e2fsck_t ctx;
|
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 23:12:14 +08:00
|
|
|
ext2_ino_t ino;
|
|
|
|
int dup_blocks;
|
2002-08-02 00:37:00 +08:00
|
|
|
struct ext2_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-04 01:48:10 +08:00
|
|
|
struct problem_context *pctx;
|
1997-04-26 21:21:57 +08:00
|
|
|
};
|
|
|
|
|
1997-11-04 03:42:40 +08:00
|
|
|
static void pass1b(e2fsck_t ctx, char *block_buf)
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ext2_filsys fs = ctx->fs;
|
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 23:12:14 +08:00
|
|
|
ext2_ino_t ino;
|
1997-04-26 21:21:57 +08:00
|
|
|
struct ext2_inode inode;
|
|
|
|
ext2_inode_scan scan;
|
|
|
|
struct process_block_struct 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-04 01:48:10 +08:00
|
|
|
struct problem_context pctx;
|
2001-07-08 11:01:31 +08: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-04 01:48:10 +08:00
|
|
|
clear_problem_context(&pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2004-02-23 04:41:11 +08:00
|
|
|
if (!(ctx->options & E2F_OPT_PREEN))
|
|
|
|
fix_problem(ctx, PR_1B_PASS_HEADER, &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-04 01:48:10 +08:00
|
|
|
pctx.errcode = ext2fs_open_inode_scan(fs, ctx->inode_buffer_blocks,
|
|
|
|
&scan);
|
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1B_ISCAN_ERROR, &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 13:23:04 +08:00
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ctx->stashed_inode = &inode;
|
|
|
|
pb.ctx = ctx;
|
|
|
|
pb.pctx = &pctx;
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
pctx.str = "pass1b";
|
2002-10-03 13:09:35 +08:00
|
|
|
while (1) {
|
|
|
|
pctx.errcode = ext2fs_get_next_inode(scan, &ino, &inode);
|
|
|
|
if (pctx.errcode == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE)
|
|
|
|
continue;
|
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1B_ISCAN_ERROR, &pctx);
|
|
|
|
ctx->flags |= E2F_FLAG_ABORT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!ino)
|
|
|
|
break;
|
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-04 01:48:10 +08:00
|
|
|
pctx.ino = ctx->stashed_ino = ino;
|
1997-04-26 21:21:57 +08:00
|
|
|
if ((ino != EXT2_BAD_INO) &&
|
2002-08-17 22:19:44 +08:00
|
|
|
!ext2fs_test_inode_bitmap(ctx->inode_used_map, ino))
|
2002-10-03 13:09:35 +08:00
|
|
|
continue;
|
1997-04-26 21:21:57 +08:00
|
|
|
|
|
|
|
pb.ino = ino;
|
|
|
|
pb.dup_blocks = 0;
|
2002-08-02 00:37:00 +08:00
|
|
|
pb.inode = &inode;
|
2002-08-17 22:19:44 +08:00
|
|
|
|
|
|
|
if (ext2fs_inode_has_valid_blocks(&inode) ||
|
|
|
|
(ino == EXT2_BAD_INO))
|
|
|
|
pctx.errcode = ext2fs_block_iterate2(fs, ino,
|
|
|
|
0, block_buf, process_pass1b_block, &pb);
|
2001-07-02 23:54:09 +08:00
|
|
|
if (inode.i_file_acl)
|
|
|
|
process_pass1b_block(fs, &inode.i_file_acl,
|
|
|
|
BLOCK_COUNT_EXTATTR, 0, 0, &pb);
|
1997-04-26 21:21:57 +08:00
|
|
|
if (pb.dup_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-04 01:48:10 +08:00
|
|
|
end_problem_latch(ctx, PR_LATCH_DBLOCK);
|
2002-08-02 00:37:00 +08:00
|
|
|
if (ino >= EXT2_FIRST_INODE(fs->super) ||
|
|
|
|
ino == EXT2_ROOT_INO)
|
1997-04-26 21:21:57 +08:00
|
|
|
dup_inode_count++;
|
|
|
|
}
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
if (pctx.errcode)
|
|
|
|
fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
ext2fs_close_inode_scan(scan);
|
2001-06-02 03:29:36 +08:00
|
|
|
e2fsck_use_inode_shortcuts(ctx, 0);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
|
2003-12-07 14:28:50 +08:00
|
|
|
static int process_pass1b_block(ext2_filsys fs EXT2FS_ATTR((unused)),
|
2001-01-06 13:55:58 +08:00
|
|
|
blk_t *block_nr,
|
2003-12-07 14:28:50 +08:00
|
|
|
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
|
|
|
|
blk_t ref_blk EXT2FS_ATTR((unused)),
|
|
|
|
int ref_offset EXT2FS_ATTR((unused)),
|
2001-01-06 13:55:58 +08:00
|
|
|
void *priv_data)
|
1997-04-26 21:21:57 +08:00
|
|
|
{
|
|
|
|
struct process_block_struct *p;
|
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-04 01:48:10 +08:00
|
|
|
e2fsck_t ctx;
|
1997-04-26 21:21:57 +08: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 23:55:07 +08:00
|
|
|
if (HOLE_BLKADDR(*block_nr))
|
1997-04-26 21:21:57 +08:00
|
|
|
return 0;
|
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 22:50:49 +08: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-04 01:48:10 +08:00
|
|
|
ctx = p->ctx;
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
if (!ext2fs_test_block_bitmap(ctx->block_dup_map, *block_nr))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* OK, this is a duplicate block */
|
|
|
|
if (p->ino != EXT2_BAD_INO) {
|
|
|
|
p->pctx->blk = *block_nr;
|
|
|
|
fix_problem(ctx, PR_1B_DUP_BLOCK, p->pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
2002-08-02 00:37:00 +08:00
|
|
|
p->dup_blocks++;
|
|
|
|
ext2fs_mark_inode_bitmap(inode_dup_map, p->ino);
|
|
|
|
|
|
|
|
add_dupe(ctx, p->ino, *block_nr, p->inode);
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Pass 1c: Scan directories for inodes with duplicate blocks. This
|
|
|
|
* is used so that we can print pathnames when prompting the user for
|
|
|
|
* what to do.
|
|
|
|
*/
|
1997-04-30 00:15:03 +08:00
|
|
|
struct search_dir_struct {
|
1997-04-26 21:21:57 +08:00
|
|
|
int count;
|
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 23:12:14 +08:00
|
|
|
ext2_ino_t first_inode;
|
|
|
|
ext2_ino_t max_inode;
|
1997-04-26 21:21:57 +08: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 23:12:14 +08:00
|
|
|
static int search_dirent_proc(ext2_ino_t dir, int entry,
|
1997-04-30 00:15:03 +08:00
|
|
|
struct ext2_dir_entry *dirent,
|
2003-12-07 14:28:50 +08:00
|
|
|
int offset EXT2FS_ATTR((unused)),
|
|
|
|
int blocksize EXT2FS_ATTR((unused)),
|
|
|
|
char *buf EXT2FS_ATTR((unused)),
|
|
|
|
void *priv_data)
|
1997-04-30 00:15:03 +08: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 22:50:49 +08:00
|
|
|
struct search_dir_struct *sd;
|
1997-04-30 00:15:03 +08:00
|
|
|
struct dup_inode *p;
|
2002-08-02 00:37:00 +08:00
|
|
|
dnode_t *n;
|
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 22:50:49 +08:00
|
|
|
|
|
|
|
sd = (struct search_dir_struct *) priv_data;
|
|
|
|
|
1997-04-30 01:48:10 +08:00
|
|
|
if (dirent->inode > sd->max_inode)
|
|
|
|
/* Should abort this inode, but not everything */
|
|
|
|
return 0;
|
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
if ((dirent->inode < sd->first_inode) || (entry < DIRENT_OTHER_FILE) ||
|
1997-04-30 00:15:03 +08:00
|
|
|
!ext2fs_test_inode_bitmap(inode_dup_map, dirent->inode))
|
|
|
|
return 0;
|
|
|
|
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&ino_dict, INT_TO_VOIDPTR(dirent->inode));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (!n)
|
1997-04-30 00:15:03 +08:00
|
|
|
return 0;
|
2002-08-02 00:37:00 +08:00
|
|
|
p = (struct dup_inode *) dnode_get(n);
|
1997-04-30 00:15:03 +08:00
|
|
|
p->dir = dir;
|
|
|
|
sd->count--;
|
|
|
|
|
|
|
|
return(sd->count ? 0 : DIRENT_ABORT);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1997-11-04 03:42:40 +08:00
|
|
|
static void pass1c(e2fsck_t ctx, char *block_buf)
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ext2_filsys fs = ctx->fs;
|
1997-04-30 00:15:03 +08:00
|
|
|
struct search_dir_struct sd;
|
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-04 01:48:10 +08:00
|
|
|
struct problem_context pctx;
|
|
|
|
|
|
|
|
clear_problem_context(&pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2004-02-23 04:41:11 +08:00
|
|
|
if (!(ctx->options & E2F_OPT_PREEN))
|
|
|
|
fix_problem(ctx, PR_1C_PASS_HEADER, &pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Search through all directories to translate inodes to names
|
|
|
|
* (by searching for the containing directory for that inode.)
|
|
|
|
*/
|
2002-08-02 00:37:00 +08:00
|
|
|
sd.count = dup_inode_count;
|
1997-04-30 00:15:03 +08:00
|
|
|
sd.first_inode = EXT2_FIRST_INODE(fs->super);
|
1997-04-30 01:48:10 +08:00
|
|
|
sd.max_inode = fs->super->s_inodes_count;
|
1997-04-30 00:15:03 +08:00
|
|
|
ext2fs_dblist_dir_iterate(fs->dblist, 0, block_buf,
|
|
|
|
search_dirent_proc, &sd);
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
static void pass1d(e2fsck_t ctx, char *block_buf)
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ext2_filsys fs = ctx->fs;
|
2002-08-02 00:37:00 +08:00
|
|
|
struct dup_inode *p, *t;
|
|
|
|
struct dup_block *q;
|
|
|
|
ext2_ino_t *shared, ino;
|
1997-04-26 21:21:57 +08:00
|
|
|
int shared_len;
|
|
|
|
int i;
|
|
|
|
int file_ok;
|
1997-04-30 01:48:10 +08:00
|
|
|
int meta_data = 0;
|
1997-04-30 00:15:03 +08:00
|
|
|
struct problem_context pctx;
|
2002-08-02 00:37:00 +08:00
|
|
|
dnode_t *n, *m;
|
|
|
|
struct block_el *s;
|
|
|
|
struct inode_el *r;
|
|
|
|
|
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-04 01:48:10 +08:00
|
|
|
clear_problem_context(&pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2004-02-23 04:41:11 +08:00
|
|
|
if (!(ctx->options & E2F_OPT_PREEN))
|
|
|
|
fix_problem(ctx, PR_1D_PASS_HEADER, &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 13:23:04 +08:00
|
|
|
e2fsck_read_bitmaps(ctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
pctx.num = dup_inode_count; /* dict_count(&ino_dict); */
|
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-04 01:48:10 +08:00
|
|
|
fix_problem(ctx, PR_1D_NUM_DUP_INODES, &pctx);
|
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 23:12:14 +08:00
|
|
|
shared = (ext2_ino_t *) e2fsck_allocate_memory(ctx,
|
2002-08-02 00:37:00 +08:00
|
|
|
sizeof(ext2_ino_t) * dict_count(&ino_dict),
|
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 22:50:49 +08:00
|
|
|
"Shared inode list");
|
2002-08-02 00:37:00 +08:00
|
|
|
for (n = dict_first(&ino_dict); n; n = dict_next(&ino_dict, n)) {
|
|
|
|
p = (struct dup_inode *) dnode_get(n);
|
1997-04-26 21:21:57 +08:00
|
|
|
shared_len = 0;
|
|
|
|
file_ok = 1;
|
2003-08-02 02:26:23 +08:00
|
|
|
ino = (ext2_ino_t)VOIDPTR_TO_INT(dnode_getkey(n));
|
2005-04-15 05:10:14 +08:00
|
|
|
if (ino == EXT2_BAD_INO || ino == EXT2_RESIZE_INO)
|
1997-04-26 21:21:57 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
2002-08-02 00:37:00 +08:00
|
|
|
* Find all of the inodes which share blocks with this
|
|
|
|
* one. First we find all of the duplicate blocks
|
|
|
|
* belonging to this inode, and then search each block
|
|
|
|
* get the list of inodes, and merge them together.
|
1997-04-26 21:21:57 +08:00
|
|
|
*/
|
2002-08-02 00:37:00 +08:00
|
|
|
for (s = p->block_list; s; s = s->next) {
|
2003-08-02 02:26:23 +08:00
|
|
|
m = dict_lookup(&blk_dict, INT_TO_VOIDPTR(s->block));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (!m)
|
|
|
|
continue; /* Should never happen... */
|
|
|
|
q = (struct dup_block *) dnode_get(m);
|
1997-04-26 21:21:57 +08:00
|
|
|
if (q->num_bad > 1)
|
|
|
|
file_ok = 0;
|
2002-08-02 00:37:00 +08:00
|
|
|
if (check_if_fs_block(ctx, s->block)) {
|
1997-04-30 01:48:10 +08:00
|
|
|
file_ok = 0;
|
|
|
|
meta_data = 1;
|
|
|
|
}
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
/*
|
|
|
|
* Add all inodes used by this block to the
|
|
|
|
* shared[] --- which is a unique list, so
|
|
|
|
* if an inode is already in shared[], don't
|
|
|
|
* add it again.
|
|
|
|
*/
|
2002-08-02 00:37:00 +08:00
|
|
|
for (r = q->inode_list; r; r = r->next) {
|
|
|
|
if (r->inode == ino)
|
1997-04-26 21:21:57 +08:00
|
|
|
continue;
|
|
|
|
for (i = 0; i < shared_len; i++)
|
2002-08-02 00:37:00 +08:00
|
|
|
if (shared[i] == r->inode)
|
1997-04-26 21:21:57 +08:00
|
|
|
break;
|
|
|
|
if (i == shared_len) {
|
2002-08-02 00:37:00 +08:00
|
|
|
shared[shared_len++] = r->inode;
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1997-04-30 00:15:03 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Report the inode that we are working on
|
|
|
|
*/
|
|
|
|
pctx.inode = &p->inode;
|
2002-08-02 00:37:00 +08:00
|
|
|
pctx.ino = ino;
|
1997-04-30 00:15:03 +08:00
|
|
|
pctx.dir = p->dir;
|
|
|
|
pctx.blkcount = p->num_dupblocks;
|
1997-04-30 01:48:10 +08:00
|
|
|
pctx.num = meta_data ? shared_len+1 : shared_len;
|
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-04 01:48:10 +08:00
|
|
|
fix_problem(ctx, PR_1D_DUP_FILE, &pctx);
|
1997-04-30 00:15:03 +08:00
|
|
|
pctx.blkcount = 0;
|
|
|
|
pctx.num = 0;
|
|
|
|
|
1997-04-30 01:48:10 +08:00
|
|
|
if (meta_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-04 01:48:10 +08:00
|
|
|
fix_problem(ctx, PR_1D_SHARE_METADATA, &pctx);
|
1997-04-30 01:48:10 +08:00
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
for (i = 0; i < shared_len; i++) {
|
2003-08-02 02:26:23 +08:00
|
|
|
m = dict_lookup(&ino_dict, INT_TO_VOIDPTR(shared[i]));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (!m)
|
|
|
|
continue; /* should never happen */
|
|
|
|
t = (struct dup_inode *) dnode_get(m);
|
1997-04-30 00:15:03 +08:00
|
|
|
/*
|
|
|
|
* Report the inode that we are sharing with
|
|
|
|
*/
|
2002-08-02 00:37:00 +08:00
|
|
|
pctx.inode = &t->inode;
|
|
|
|
pctx.ino = shared[i];
|
|
|
|
pctx.dir = t->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-04 01:48:10 +08:00
|
|
|
fix_problem(ctx, PR_1D_DUP_FILE_LIST, &pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
if (file_ok) {
|
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-04 01:48:10 +08:00
|
|
|
fix_problem(ctx, PR_1D_DUP_BLOCKS_DEALT, &pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
continue;
|
|
|
|
}
|
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-04 01:48:10 +08:00
|
|
|
if (fix_problem(ctx, PR_1D_CLONE_QUESTION, &pctx)) {
|
2002-08-02 00:37:00 +08:00
|
|
|
pctx.errcode = clone_file(ctx, ino, p, 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-04 01:48:10 +08:00
|
|
|
if (pctx.errcode)
|
|
|
|
fix_problem(ctx, PR_1D_CLONE_ERROR, &pctx);
|
|
|
|
else
|
1997-04-26 21:21:57 +08:00
|
|
|
continue;
|
|
|
|
}
|
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-04 01:48:10 +08:00
|
|
|
if (fix_problem(ctx, PR_1D_DELETE_QUESTION, &pctx))
|
2002-08-02 00:37:00 +08:00
|
|
|
delete_file(ctx, ino, p, block_buf);
|
1997-04-26 21:21:57 +08:00
|
|
|
else
|
|
|
|
ext2fs_unmark_valid(fs);
|
|
|
|
}
|
2003-08-01 21:41:07 +08:00
|
|
|
ext2fs_free_mem(&shared);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
|
2001-07-08 01:20:34 +08:00
|
|
|
/*
|
|
|
|
* Drop the refcount on the dup_block structure, and clear the entry
|
|
|
|
* in the block_dup_map if appropriate.
|
|
|
|
*/
|
2002-08-02 00:37:00 +08:00
|
|
|
static void decrement_badcount(e2fsck_t ctx, blk_t block, struct dup_block *p)
|
2001-07-08 01:20:34 +08:00
|
|
|
{
|
|
|
|
p->num_bad--;
|
|
|
|
if (p->num_bad <= 0 ||
|
2002-08-02 00:37:00 +08:00
|
|
|
(p->num_bad == 1 && !check_if_fs_block(ctx, block)))
|
|
|
|
ext2fs_unmark_block_bitmap(ctx->block_dup_map, block);
|
2001-07-08 01:20:34 +08:00
|
|
|
}
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
static int delete_file_block(ext2_filsys fs,
|
|
|
|
blk_t *block_nr,
|
2003-12-07 14:28:50 +08:00
|
|
|
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
|
|
|
|
blk_t ref_block EXT2FS_ATTR((unused)),
|
|
|
|
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 22:50:49 +08:00
|
|
|
void *priv_data)
|
1997-04-26 21:21:57 +08: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 22:50:49 +08:00
|
|
|
struct process_block_struct *pb;
|
1997-04-26 21:21:57 +08:00
|
|
|
struct dup_block *p;
|
2002-08-02 00:37:00 +08:00
|
|
|
dnode_t *n;
|
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-04 01:48:10 +08: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 22:50:49 +08:00
|
|
|
pb = (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-04 01:48:10 +08:00
|
|
|
ctx = pb->ctx;
|
1997-04-26 21:21:57 +08: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 23:55:07 +08:00
|
|
|
if (HOLE_BLKADDR(*block_nr))
|
1997-04-26 21:21:57 +08:00
|
|
|
return 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-04 01:48:10 +08:00
|
|
|
if (ext2fs_test_block_bitmap(ctx->block_dup_map, *block_nr)) {
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&blk_dict, INT_TO_VOIDPTR(*block_nr));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (n) {
|
|
|
|
p = (struct dup_block *) dnode_get(n);
|
|
|
|
decrement_badcount(ctx, *block_nr, p);
|
1997-04-26 21:21:57 +08:00
|
|
|
} else
|
|
|
|
com_err("delete_file_block", 0,
|
2006-03-19 10:43:46 +08:00
|
|
|
_("internal error; can't find dup_blk for %u\n"),
|
1997-04-26 21:21:57 +08:00
|
|
|
*block_nr);
|
|
|
|
} 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-04 01:48:10 +08:00
|
|
|
ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr);
|
2002-08-17 22:19:44 +08:00
|
|
|
ext2fs_block_alloc_stats(fs, *block_nr, -1);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
static void delete_file(e2fsck_t ctx, ext2_ino_t ino,
|
|
|
|
struct dup_inode *dp, char* block_buf)
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ext2_filsys fs = ctx->fs;
|
1997-04-26 21:21:57 +08:00
|
|
|
struct process_block_struct pb;
|
|
|
|
struct ext2_inode inode;
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
struct problem_context pctx;
|
2002-08-17 22:19:44 +08:00
|
|
|
unsigned int count;
|
1997-04-26 21:21:57 +08:00
|
|
|
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
clear_problem_context(&pctx);
|
2002-08-02 00:37:00 +08:00
|
|
|
pctx.ino = pb.ino = ino;
|
1997-04-26 21:21:57 +08:00
|
|
|
pb.dup_blocks = dp->num_dupblocks;
|
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-04 01:48:10 +08:00
|
|
|
pb.ctx = ctx;
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
pctx.str = "delete_file";
|
|
|
|
|
2002-08-17 22:19:44 +08:00
|
|
|
e2fsck_read_inode(ctx, ino, &inode, "delete_file");
|
|
|
|
if (ext2fs_inode_has_valid_blocks(&inode))
|
|
|
|
pctx.errcode = ext2fs_block_iterate2(fs, ino, 0, block_buf,
|
|
|
|
delete_file_block, &pb);
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
if (pctx.errcode)
|
|
|
|
fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx);
|
2002-08-02 00:37:00 +08:00
|
|
|
ext2fs_unmark_inode_bitmap(ctx->inode_used_map, ino);
|
|
|
|
ext2fs_unmark_inode_bitmap(ctx->inode_dir_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-04 01:48:10 +08:00
|
|
|
if (ctx->inode_bad_map)
|
2002-08-02 00:37:00 +08:00
|
|
|
ext2fs_unmark_inode_bitmap(ctx->inode_bad_map, ino);
|
2002-08-17 22:19:44 +08:00
|
|
|
ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode));
|
|
|
|
|
|
|
|
/* Inode may have changed by block_iterate, so reread it */
|
2002-08-02 00:37:00 +08:00
|
|
|
e2fsck_read_inode(ctx, ino, &inode, "delete_file");
|
1997-04-26 21:21:57 +08:00
|
|
|
inode.i_links_count = 0;
|
2005-04-15 02:07:53 +08:00
|
|
|
inode.i_dtime = ctx->now;
|
2002-08-17 22:19:44 +08:00
|
|
|
if (inode.i_file_acl &&
|
|
|
|
(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_EXT_ATTR)) {
|
|
|
|
count = 1;
|
|
|
|
pctx.errcode = ext2fs_adjust_ea_refcount(fs, inode.i_file_acl,
|
|
|
|
block_buf, -1, &count);
|
|
|
|
if (pctx.errcode == EXT2_ET_BAD_EA_BLOCK_NUM) {
|
|
|
|
pctx.errcode = 0;
|
|
|
|
count = 1;
|
|
|
|
}
|
|
|
|
if (pctx.errcode) {
|
|
|
|
pctx.blk = inode.i_file_acl;
|
|
|
|
fix_problem(ctx, PR_1B_ADJ_EA_REFCOUNT, &pctx);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If the count is zero, then arrange to have the
|
|
|
|
* block deleted. If the block is in the block_dup_map,
|
|
|
|
* also call delete_file_block since it will take care
|
|
|
|
* of keeping the accounting straight.
|
|
|
|
*/
|
|
|
|
if ((count == 0) ||
|
|
|
|
ext2fs_test_block_bitmap(ctx->block_dup_map,
|
|
|
|
inode.i_file_acl))
|
|
|
|
delete_file_block(fs, &inode.i_file_acl,
|
|
|
|
BLOCK_COUNT_EXTATTR, 0, 0, &pb);
|
|
|
|
}
|
2002-08-02 00:37:00 +08:00
|
|
|
e2fsck_write_inode(ctx, ino, &inode, "delete_file");
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct clone_struct {
|
|
|
|
errcode_t errcode;
|
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 23:12:14 +08:00
|
|
|
ext2_ino_t dir;
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
e2fsck_t ctx;
|
1997-04-26 21:21:57 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int clone_file_block(ext2_filsys fs,
|
|
|
|
blk_t *block_nr,
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
e2_blkcnt_t blockcnt,
|
2003-12-07 14:28:50 +08:00
|
|
|
blk_t ref_block EXT2FS_ATTR((unused)),
|
|
|
|
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 22:50:49 +08:00
|
|
|
void *priv_data)
|
1997-04-26 21:21:57 +08:00
|
|
|
{
|
|
|
|
struct dup_block *p;
|
|
|
|
blk_t new_block;
|
|
|
|
errcode_t retval;
|
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 22:50:49 +08:00
|
|
|
struct clone_struct *cs = (struct clone_struct *) priv_data;
|
2002-08-02 00:37:00 +08:00
|
|
|
dnode_t *n;
|
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-04 01:48:10 +08:00
|
|
|
e2fsck_t ctx;
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ctx = cs->ctx;
|
|
|
|
|
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 23:55:07 +08:00
|
|
|
if (HOLE_BLKADDR(*block_nr))
|
1997-04-26 21:21:57 +08:00
|
|
|
return 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-04 01:48:10 +08:00
|
|
|
if (ext2fs_test_block_bitmap(ctx->block_dup_map, *block_nr)) {
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&blk_dict, INT_TO_VOIDPTR(*block_nr));
|
2002-08-02 00:37:00 +08:00
|
|
|
if (n) {
|
|
|
|
p = (struct dup_block *) dnode_get(n);
|
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-04 01:48:10 +08:00
|
|
|
retval = ext2fs_new_block(fs, 0, ctx->block_found_map,
|
1997-04-26 21:21:57 +08:00
|
|
|
&new_block);
|
|
|
|
if (retval) {
|
|
|
|
cs->errcode = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
2001-06-02 03:29:36 +08:00
|
|
|
if (cs->dir && (blockcnt >= 0)) {
|
1997-04-30 01:48:10 +08:00
|
|
|
retval = ext2fs_set_dir_block(fs->dblist,
|
|
|
|
cs->dir, new_block, blockcnt);
|
|
|
|
if (retval) {
|
|
|
|
cs->errcode = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
|
|
|
}
|
2001-07-08 11:01:31 +08:00
|
|
|
#if 0
|
|
|
|
printf("Cloning block %u to %u\n", *block_nr,
|
|
|
|
new_block);
|
|
|
|
#endif
|
1997-04-26 21:21:57 +08:00
|
|
|
retval = io_channel_read_blk(fs->io, *block_nr, 1,
|
|
|
|
cs->buf);
|
|
|
|
if (retval) {
|
|
|
|
cs->errcode = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
|
|
|
retval = io_channel_write_blk(fs->io, new_block, 1,
|
|
|
|
cs->buf);
|
|
|
|
if (retval) {
|
|
|
|
cs->errcode = retval;
|
|
|
|
return BLOCK_ABORT;
|
|
|
|
}
|
2002-08-02 00:37:00 +08:00
|
|
|
decrement_badcount(ctx, *block_nr, p);
|
1997-04-26 21:21:57 +08:00
|
|
|
*block_nr = 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-04 01:48:10 +08:00
|
|
|
ext2fs_mark_block_bitmap(ctx->block_found_map,
|
1997-04-26 21:21:57 +08:00
|
|
|
new_block);
|
1997-04-26 21:34:30 +08:00
|
|
|
ext2fs_mark_block_bitmap(fs->block_map, new_block);
|
1997-04-26 21:21:57 +08:00
|
|
|
return BLOCK_CHANGED;
|
|
|
|
} else
|
|
|
|
com_err("clone_file_block", 0,
|
2006-03-19 10:43:46 +08:00
|
|
|
_("internal error; can't find dup_blk for %u\n"),
|
1997-04-26 21:21:57 +08:00
|
|
|
*block_nr);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
static int clone_file(e2fsck_t ctx, ext2_ino_t ino,
|
|
|
|
struct dup_inode *dp, char* block_buf)
|
1997-04-26 21:21:57 +08: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-04 01:48:10 +08:00
|
|
|
ext2_filsys fs = ctx->fs;
|
1997-04-26 21:21:57 +08:00
|
|
|
errcode_t retval;
|
|
|
|
struct clone_struct cs;
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
struct problem_context pctx;
|
2001-07-08 01:20:34 +08:00
|
|
|
blk_t blk;
|
2002-08-02 00:37:00 +08:00
|
|
|
dnode_t *n;
|
|
|
|
struct inode_el *ino_el;
|
|
|
|
struct dup_block *db;
|
|
|
|
struct dup_inode *di;
|
1997-04-26 21:21:57 +08:00
|
|
|
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
clear_problem_context(&pctx);
|
1997-04-26 21:21:57 +08:00
|
|
|
cs.errcode = 0;
|
1997-04-30 01:48:10 +08:00
|
|
|
cs.dir = 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-04 01:48:10 +08:00
|
|
|
cs.ctx = ctx;
|
2003-08-01 21:41:07 +08:00
|
|
|
retval = ext2fs_get_mem(fs->blocksize, &cs.buf);
|
1997-11-04 03:42:40 +08:00
|
|
|
if (retval)
|
|
|
|
return retval;
|
1997-04-30 01:48:10 +08:00
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
if (ext2fs_test_inode_bitmap(ctx->inode_dir_map, ino))
|
|
|
|
cs.dir = ino;
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
|
2002-08-02 00:37:00 +08:00
|
|
|
pctx.ino = ino;
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
pctx.str = "clone_file";
|
2002-08-17 22:19:44 +08:00
|
|
|
if (ext2fs_inode_has_valid_blocks(&dp->inode))
|
|
|
|
pctx.errcode = ext2fs_block_iterate2(fs, ino, 0, block_buf,
|
|
|
|
clone_file_block, &cs);
|
1997-04-26 21:21:57 +08:00
|
|
|
ext2fs_mark_bb_dirty(fs);
|
ChangeLog, message.c, pass1b.c, pass2.c, pass3.c, problem.c, problem.h:
pass1b.c: Change routines to use PR_1B_BLOCK_ITERATE when reporting
problems rather than using com_err directly.
problem.c, problem.h (PR_1B_BLOCK_ITERATE): Add new problem code.
message.c (expand_percent_expression): Add safety check. If ctx->str
is NULL, print "NULL" instead of dereferencing the null pointer.
pass1b.c, pass2.c, pass3.c: Change calls to ext2fs_block_iterate to
ext2fs_block_iterate2, to support 64-bit filesizes and to speed things
up slightly by avoiding the use of the ext2fs_block_iterate's
compatibility shim layer.
version.h:
Update for WIP release.
2000-11-17 13:40:49 +08:00
|
|
|
if (pctx.errcode) {
|
|
|
|
fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx);
|
2001-07-08 01:20:34 +08:00
|
|
|
retval = pctx.errcode;
|
|
|
|
goto errout;
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
if (cs.errcode) {
|
1997-10-24 12:18:21 +08:00
|
|
|
com_err("clone_file", cs.errcode,
|
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 11:11:03 +08:00
|
|
|
_("returned from clone_file_block"));
|
2001-07-08 01:20:34 +08:00
|
|
|
retval = cs.errcode;
|
|
|
|
goto errout;
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
2002-08-17 22:19:44 +08:00
|
|
|
/* The inode may have changed on disk, so we have to re-read it */
|
|
|
|
e2fsck_read_inode(ctx, ino, &dp->inode, "clone file EA");
|
2001-07-08 01:20:34 +08:00
|
|
|
blk = dp->inode.i_file_acl;
|
|
|
|
if (blk && (clone_file_block(fs, &dp->inode.i_file_acl,
|
|
|
|
BLOCK_COUNT_EXTATTR, 0, 0, &cs) ==
|
|
|
|
BLOCK_CHANGED)) {
|
2002-08-02 00:37:00 +08:00
|
|
|
e2fsck_write_inode(ctx, ino, &dp->inode, "clone file EA");
|
2001-07-02 23:54:09 +08:00
|
|
|
/*
|
|
|
|
* If we cloned the EA block, find all other inodes
|
|
|
|
* which refered to that EA block, and modify
|
|
|
|
* them to point to the new EA block.
|
|
|
|
*/
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&blk_dict, INT_TO_VOIDPTR(blk));
|
2002-08-02 00:37:00 +08:00
|
|
|
db = (struct dup_block *) dnode_get(n);
|
|
|
|
for (ino_el = db->inode_list; ino_el; ino_el = ino_el->next) {
|
|
|
|
if (ino_el->inode == ino)
|
2001-07-02 23:54:09 +08:00
|
|
|
continue;
|
2003-08-02 02:26:23 +08:00
|
|
|
n = dict_lookup(&ino_dict, INT_TO_VOIDPTR(ino_el->inode));
|
2002-08-02 00:37:00 +08:00
|
|
|
di = (struct dup_inode *) dnode_get(n);
|
|
|
|
if (di->inode.i_file_acl == blk) {
|
|
|
|
di->inode.i_file_acl = dp->inode.i_file_acl;
|
|
|
|
e2fsck_write_inode(ctx, ino_el->inode,
|
2002-08-17 22:19:44 +08:00
|
|
|
&di->inode, "clone file EA");
|
2002-08-02 00:37:00 +08:00
|
|
|
decrement_badcount(ctx, blk, db);
|
2001-07-08 01:20:34 +08:00
|
|
|
}
|
2001-07-02 23:54:09 +08:00
|
|
|
}
|
|
|
|
}
|
2001-07-08 01:20:34 +08:00
|
|
|
retval = 0;
|
|
|
|
errout:
|
2003-08-01 21:41:07 +08:00
|
|
|
ext2fs_free_mem(&cs.buf);
|
2001-07-08 01:20:34 +08:00
|
|
|
return retval;
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
2000-02-09 07:19:32 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This routine returns 1 if a block overlaps with one of the superblocks,
|
|
|
|
* group descriptors, inode bitmaps, or block bitmaps.
|
|
|
|
*/
|
|
|
|
static int check_if_fs_block(e2fsck_t ctx, blk_t test_block)
|
|
|
|
{
|
|
|
|
ext2_filsys fs = ctx->fs;
|
|
|
|
blk_t block;
|
2003-12-07 14:28:50 +08:00
|
|
|
dgrp_t i;
|
2000-02-09 07:19:32 +08:00
|
|
|
|
|
|
|
block = fs->super->s_first_data_block;
|
|
|
|
for (i = 0; i < fs->group_desc_count; i++) {
|
|
|
|
|
|
|
|
/* Check superblocks/block group descriptros */
|
|
|
|
if (ext2fs_bg_has_super(fs, i)) {
|
|
|
|
if (test_block >= block &&
|
|
|
|
(test_block <= block + fs->desc_blocks))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check the inode table */
|
|
|
|
if ((fs->group_desc[i].bg_inode_table) &&
|
|
|
|
(test_block >= fs->group_desc[i].bg_inode_table) &&
|
|
|
|
(test_block < (fs->group_desc[i].bg_inode_table +
|
|
|
|
fs->inode_blocks_per_group)))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* Check the bitmap blocks */
|
|
|
|
if ((test_block == fs->group_desc[i].bg_block_bitmap) ||
|
|
|
|
(test_block == fs->group_desc[i].bg_inode_bitmap))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
block += fs->super->s_blocks_per_group;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|