X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fe2fsck.h;h=5a4a0de0a76c9ba84b2641a81e21178ff46e72f2;hb=30ab7f4c65bd32a7d24f53e8c87ed5b5ae757626;hp=9fb392296e12ff0d78dff7d9afb4af6fb0684ed4;hpb=ad4fa4660404ed88a3231fee338397af11e041b4;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index 9fb3922..5a4a0de 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -6,6 +6,9 @@ * */ +#ifndef _E2FSCK_H +#define _E2FSCK_H + #include #include #ifdef HAVE_UNISTD_H @@ -26,11 +29,16 @@ #if EXT2_FLAT_INCLUDES #include "ext2_fs.h" #include "ext2fs.h" +#include "blkid.h" #else #include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" +#include "blkid/blkid.h" #endif +#include "profile.h" +#include "prof_err.h" + #ifdef ENABLE_NLS #include #include @@ -40,13 +48,17 @@ #else #define N_(a) (a) #endif -/* FIXME */ +#define P_(singular, plural, n) (ngettext (singular, plural, n)) +#ifndef NLS_CAT_NAME #define NLS_CAT_NAME "e2fsprogs" +#endif +#ifndef LOCALEDIR #define LOCALEDIR "/usr/share/locale" -/* FIXME */ +#endif #else #define _(a) (a) #define N_(a) a +#define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural)) #endif /* @@ -123,6 +135,8 @@ struct resource_track { struct timeval user_start; struct timeval system_start; void *brk_start; + unsigned long long bytes_read; + unsigned long long bytes_written; }; #endif @@ -140,6 +154,7 @@ struct resource_track { #define E2F_OPT_FORCE 0x0100 #define E2F_OPT_WRITECHECK 0x0200 #define E2F_OPT_COMPRESS_DIRS 0x0400 +#define E2F_OPT_FRAGCHECK 0x0800 /* * E2fsck flags @@ -156,6 +171,9 @@ struct resource_track { #define E2F_FLAG_JOURNAL_INODE 0x0080 /* Create a new ext3 journal inode */ #define E2F_FLAG_SB_SPECIFIED 0x0100 /* The superblock was explicitly * specified by the user */ +#define E2F_FLAG_RESTARTED 0x0200 /* E2fsck has been restarted */ +#define E2F_FLAG_RESIZE_INODE 0x0400 /* Request to recreate resize inode */ +#define E2F_FLAG_GOT_DEVSIZE 0x0800 /* Device size has been fetched */ /* * Defines for indicating the e2fsck pass number @@ -177,17 +195,22 @@ typedef struct ea_refcount *ext2_refcount_t; */ typedef struct e2fsck_struct *e2fsck_t; +#define MAX_EXTENT_DEPTH_COUNT 5 + struct e2fsck_struct { ext2_filsys fs; const char *program_name; - const char *filesystem_name; - const char *device_name; + char *filesystem_name; + char *device_name; + char *io_options; int flags; /* E2fsck internal flags */ int options; blk_t use_superblock; /* sb requested by user */ blk_t superblock; /* sb used to open fs */ int blocksize; /* blocksize */ blk_t num_blocks; /* Total number of blocks */ + int mount_flags; + blkid_cache blkid; /* blkid cache */ #ifdef HAVE_SETJMP_H jmp_buf abort_loc; @@ -246,9 +269,7 @@ struct e2fsck_struct { /* * Directory information */ - int dir_info_count; - int dir_info_size; - struct dir_info *dir_info; + struct dir_info_db *dir_info; /* * Indexed directory information @@ -272,7 +293,7 @@ struct e2fsck_struct { * ext3 journal support */ io_channel journal_io; - const char *journal_name; + char *journal_name; #ifdef RESOURCE_TRACK /* @@ -288,28 +309,36 @@ struct e2fsck_struct { int progress_pos; int progress_last_percent; unsigned int progress_last_time; - + int interactive; /* Are we connected directly to a tty? */ + char start_meta[2], stop_meta[2]; + /* File counts */ - int fs_directory_count; - int fs_regular_count; - int fs_blockdev_count; - int fs_chardev_count; - int fs_links_count; - int fs_symlinks_count; - int fs_fast_symlinks_count; - int fs_fifo_count; - int fs_total_count; - int fs_badblocks_count; - int fs_sockets_count; - int fs_ind_count; - int fs_dind_count; - int fs_tind_count; - int fs_fragmented; - int large_files; - int fs_ext_attr_inodes; - int fs_ext_attr_blocks; - + __u32 fs_directory_count; + __u32 fs_regular_count; + __u32 fs_blockdev_count; + __u32 fs_chardev_count; + __u32 fs_links_count; + __u32 fs_symlinks_count; + __u32 fs_fast_symlinks_count; + __u32 fs_fifo_count; + __u32 fs_total_count; + __u32 fs_badblocks_count; + __u32 fs_sockets_count; + __u32 fs_ind_count; + __u32 fs_dind_count; + __u32 fs_tind_count; + __u32 fs_fragmented; + __u32 large_files; + __u32 fs_ext_attr_inodes; + __u32 fs_ext_attr_blocks; + __u32 extent_depth_count[MAX_EXTENT_DEPTH_COUNT]; + + /* misc fields */ + time_t now; + time_t time_fudge; /* For working around buggy init scripts */ int ext_attr_ver; + profile_t profile; + int blocks_per_page; /* * For the use of callers of the e2fsck functions; not used by @@ -322,6 +351,11 @@ struct e2fsck_struct { typedef __u32 region_addr_t; typedef struct region_struct *region_t; +#ifndef HAVE_STRNLEN +#define strnlen(str, x) e2fsck_strnlen((str),(x)) +extern int e2fsck_strnlen(const char * s, int count); +#endif + /* * Procedure declarations */ @@ -343,14 +377,26 @@ extern int e2fsck_run(e2fsck_t ctx); /* badblock.c */ extern void read_bad_blocks_file(e2fsck_t ctx, const char *bad_blocks_file, int replace_bad_blocks); -extern void test_disk(e2fsck_t ctx); + +/* crc32.c */ +extern __u32 crc32_be(__u32 crc, unsigned char const *p, size_t len); /* dirinfo.c */ extern void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent); -extern struct dir_info *e2fsck_get_dir_info(e2fsck_t ctx, ext2_ino_t ino); extern void e2fsck_free_dir_info(e2fsck_t ctx); extern int e2fsck_get_num_dirinfo(e2fsck_t ctx); -extern struct dir_info *e2fsck_dir_info_iter(e2fsck_t ctx, int *control); +extern struct dir_info_iter *e2fsck_dir_info_iter_begin(e2fsck_t ctx); +extern struct dir_info *e2fsck_dir_info_iter(e2fsck_t ctx, + struct dir_info_iter *); +extern void e2fsck_dir_info_iter_end(e2fsck_t ctx, struct dir_info_iter *); +extern int e2fsck_dir_info_set_parent(e2fsck_t ctx, ext2_ino_t ino, + ext2_ino_t parent); +extern int e2fsck_dir_info_set_dotdot(e2fsck_t ctx, ext2_ino_t ino, + ext2_ino_t dotdot); +extern int e2fsck_dir_info_get_parent(e2fsck_t ctx, ext2_ino_t ino, + ext2_ino_t *parent); +extern int e2fsck_dir_info_get_dotdot(e2fsck_t ctx, ext2_ino_t ino, + ext2_ino_t *dotdot); /* dx_dirinfo.c */ extern void e2fsck_add_dx_dir(e2fsck_t ctx, ext2_ino_t ino, int num_blocks); @@ -382,13 +428,19 @@ extern void ehandler_init(io_channel channel); extern int e2fsck_check_ext3_journal(e2fsck_t ctx); extern int e2fsck_run_ext3_journal(e2fsck_t ctx); extern void e2fsck_move_ext3_journal(e2fsck_t ctx); +extern int e2fsck_fix_ext3_journal_hint(e2fsck_t ctx); /* pass1.c */ +extern void e2fsck_setup_tdb_icount(e2fsck_t ctx, int flags, + ext2_icount_t *ret); extern void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool); extern int e2fsck_pass1_check_device_inode(ext2_filsys fs, struct ext2_inode *inode); -extern int e2fsck_pass1_check_symlink(ext2_filsys fs, +extern int e2fsck_pass1_check_symlink(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode, char *buf); +extern void e2fsck_clear_inode(e2fsck_t ctx, ext2_ino_t ino, + struct ext2_inode *inode, int restart_flag, + const char *source); /* pass2.c */ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, @@ -399,6 +451,8 @@ extern int e2fsck_reconnect_file(e2fsck_t ctx, ext2_ino_t inode); extern errcode_t e2fsck_expand_directory(e2fsck_t ctx, ext2_ino_t dir, int num, int gauranteed_size); extern ext2_ino_t e2fsck_get_lost_and_found(e2fsck_t ctx, int fix); +extern errcode_t e2fsck_adjust_inode_count(e2fsck_t ctx, ext2_ino_t ino, + int adj); /* region.c */ @@ -412,10 +466,7 @@ void e2fsck_rehash_directories(e2fsck_t ctx); /* super.c */ void check_super_block(e2fsck_t ctx); -errcode_t e2fsck_get_device_size(e2fsck_t ctx); - -/* swapfs.c */ -void swap_filesys(e2fsck_t ctx); +int check_backup_super_block(e2fsck_t ctx); /* util.c */ extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size, @@ -426,16 +477,27 @@ extern void fatal_error(e2fsck_t ctx, const char * fmt_string); extern void e2fsck_read_bitmaps(e2fsck_t ctx); extern void e2fsck_write_bitmaps(e2fsck_t ctx); extern void preenhalt(e2fsck_t ctx); +extern char *string_copy(e2fsck_t ctx, const char *str, int len); +extern errcode_t e2fsck_zero_blocks(ext2_filsys fs, blk_t blk, int num, + blk_t *ret_blk, int *ret_count); #ifdef RESOURCE_TRACK extern void print_resource_track(const char *desc, - struct resource_track *track); -extern void init_resource_track(struct resource_track *track); + struct resource_track *track, + io_channel channel); +extern void init_resource_track(struct resource_track *track, + io_channel channel); #endif extern int inode_has_valid_blocks(struct ext2_inode *inode); extern void e2fsck_read_inode(e2fsck_t ctx, unsigned long ino, struct ext2_inode * inode, const char * proc); +extern void e2fsck_read_inode_full(e2fsck_t ctx, unsigned long ino, + struct ext2_inode *inode, + const int bufsize, const char *proc); extern void e2fsck_write_inode(e2fsck_t ctx, unsigned long ino, struct ext2_inode * inode, const char * proc); +extern void e2fsck_write_inode_full(e2fsck_t ctx, unsigned long ino, + struct ext2_inode * inode, int bufsize, + const char *proc); #ifdef MTRACE extern void mtrace_print(char *mesg); #endif @@ -445,3 +507,6 @@ extern int ext2_file_type(unsigned int mode); /* unix.c */ extern void e2fsck_clear_progbar(e2fsck_t ctx); +extern int e2fsck_simple_progress(e2fsck_t ctx, const char *label, + float percent, unsigned int dpynum); +#endif /* _E2FSCK_H */