X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fe2fsck.h;h=2dc43df835b47c180613dac657098f677906227b;hb=be1e74c1c78c00bc9a31c4fe5cabd4f923c0cdd3;hp=492a2311c555e9448563b5fb6f9cc6dfbe59ddf6;hpb=ee895139d79c364aa43e6c0113c3f060081cb9fe;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index 492a231..2dc43df 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -1,13 +1,17 @@ /* * e2fsck.h - * + * * Copyright (C) 1993, 1994 Theodore Ts'o. This file may be * redistributed under the terms of the GNU Public License. - * + * */ +#ifndef _E2FSCK_H +#define _E2FSCK_H + #include #include +#include #ifdef HAVE_UNISTD_H #include #endif @@ -26,11 +30,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,15 +49,27 @@ #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 +#ifdef __GNUC__ +#define E2FSCK_ATTR(x) __attribute__(x) +#else +#define E2FSCK_ATTR(x) +#endif + +#include "quota/mkquota.h" + /* * Exit codes used by fsck-type programs */ @@ -102,9 +123,9 @@ struct dx_dirblock_info { blk_t phys; int flags; blk_t parent; - ext2_dirhash_t min_hash; + ext2_dirhash_t min_hash; ext2_dirhash_t max_hash; - ext2_dirhash_t node_min_hash; + ext2_dirhash_t node_min_hash; ext2_dirhash_t node_max_hash; }; @@ -113,6 +134,8 @@ struct dx_dirblock_info { #define DX_FLAG_FIRST 4 #define DX_FLAG_LAST 8 +#define RESOURCE_TRACK + #ifdef RESOURCE_TRACK /* * This structure is used for keeping track of how much resources have @@ -123,6 +146,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 +165,10 @@ struct resource_track { #define E2F_OPT_FORCE 0x0100 #define E2F_OPT_WRITECHECK 0x0200 #define E2F_OPT_COMPRESS_DIRS 0x0400 +#define E2F_OPT_FRAGCHECK 0x0800 +#define E2F_OPT_JOURNAL_ONLY 0x1000 /* only replay the journal */ +#define E2F_OPT_DISCARD 0x2000 +#define E2F_OPT_VERBOSE 0x4000 /* * E2fsck flags @@ -148,14 +177,30 @@ struct resource_track { #define E2F_FLAG_CANCEL 0x0002 /* Cancel signaled */ #define E2F_FLAG_SIGNAL_MASK 0x0003 #define E2F_FLAG_RESTART 0x0004 /* Restart signaled */ +#define E2F_FLAG_RESTART_LATER 0x0008 /* Restart after all iterations done */ #define E2F_FLAG_SETJMP_OK 0x0010 /* Setjmp valid for abort */ #define E2F_FLAG_PROG_BAR 0x0020 /* Progress bar on screen */ #define E2F_FLAG_PROG_SUPPRESS 0x0040 /* Progress suspended */ #define E2F_FLAG_JOURNAL_INODE 0x0080 /* Create a new ext3 journal inode */ -#define E2F_FLAG_SB_SPECIFIED 0x0100 /* The superblock was explicitly +#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 */ +#define E2F_FLAG_EXITING 0x1000 /* E2fsck exiting due to errors */ +#define E2F_FLAG_TIME_INSANE 0x2000 /* Time is insane */ +#define E2F_FLAG_EXPAND_EISIZE 0x4000 /* Expand the inodes (i_extra_isize) */ + +#define E2F_RESET_FLAGS (E2F_FLAG_TIME_INSANE) + +/* Defines for Lustre */ +#define LUSTRE_NULL 0x0000 +#define LUSTRE_MDS 0x0001 +#define LUSTRE_OST 0x0002 +#define LUSTRE_TYPE 0x000f +#define LUSTRE_ONLY 0x1000 /* * Defines for indicating the e2fsck pass number @@ -167,6 +212,35 @@ struct resource_track { #define E2F_PASS_5 5 #define E2F_PASS_1B 6 +enum shared_opt { + E2F_SHARED_PRESERVE = 0, + E2F_SHARED_DELETE, + E2F_SHARED_LPF +}; + +enum clone_opt { + E2F_CLONE_DUP = 0, + E2F_CLONE_ZERO +}; + +#define EXT4_FITS_IN_INODE(ext4_inode, einode, field) \ + ((offsetof(typeof(*ext4_inode), field) + \ + sizeof(ext4_inode->field)) <= \ + (EXT2_GOOD_OLD_INODE_SIZE + \ + (einode)->i_extra_isize)) \ + +#define EXT4_XTIME_FUTURE(ctx, sb, xtime, margin) \ + (!((ctx)->flags & E2F_FLAG_TIME_INSANE) && \ + (xtime) > (ctx)->now + (margin)) +#define EXT4_XTIME_ANCIENT(ctx, sb, xtime, margin) \ + ((sb)->s_mkfs_time > (margin) && (xtime) < (sb)->s_mkfs_time - (margin)) + +#define BADNESS_NORMAL 1 +#define BADNESS_HIGH 2 +#define BADNESS_THRESHOLD 8 +#define BADNESS_BAD_MODE 100 +#define BADNESS_LARGE_FILE 2199023255552ULL + /* * Define the extended attribute refcount structure */ @@ -177,18 +251,26 @@ 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; + FILE *logf; + char *log_fn; 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 */ + blk64_t use_superblock; /* sb requested by user */ + blk64_t superblock; /* sb used to open fs */ + blk64_t num_blocks; /* Total number of blocks */ + blk64_t free_blocks; + ino_t free_inodes; int mount_flags; + blkid_cache blkid; /* blkid cache */ #ifdef HAVE_SETJMP_H jmp_buf abort_loc; @@ -199,11 +281,11 @@ struct e2fsck_struct { unsigned long max); ext2fs_inode_bitmap inode_used_map; /* Inodes which are in use */ - ext2fs_inode_bitmap inode_bad_map; /* Inodes which are bad somehow */ ext2fs_inode_bitmap inode_dir_map; /* Inodes which are directories */ ext2fs_inode_bitmap inode_bb_map; /* Inodes which are in bad blocks */ ext2fs_inode_bitmap inode_imagic_map; /* AFS inodes */ ext2fs_inode_bitmap inode_reg_map; /* Inodes which are regular files*/ + ext2fs_inode_bitmap inode_ea_map; /* EA inodes which are non-orphan */ ext2fs_block_bitmap block_found_map; /* Blocks which are in use */ ext2fs_block_bitmap block_dup_map; /* Blks referenced more than once */ @@ -214,6 +296,8 @@ struct e2fsck_struct { */ ext2_icount_t inode_count; ext2_icount_t inode_link_info; + ext2_icount_t inode_badness; + int inode_badness_threshold; ext2_refcount_t refcount; ext2_refcount_t refcount_extra; @@ -243,13 +327,11 @@ struct e2fsck_struct { */ ext2_ino_t lost_and_found; int bad_lost_and_found; - + /* * Directory information */ - int dir_info_count; - int dir_info_size; - struct dir_info *dir_info; + struct dir_info_db *dir_info; /* * Indexed directory information @@ -268,12 +350,24 @@ struct e2fsck_struct { */ int process_inode_size; int inode_buffer_blocks; + unsigned int htree_slack_percentage; /* * ext3 journal support */ io_channel journal_io; - const char *journal_name; + char *journal_name; + + /* + * Ext4 quota support + */ + quota_ctx_t qctx; + + /* lustre support */ + int lustre_devtype; + char *lustre_mdsdb; + char *lustre_ostdb; + struct lfsck_outdb_info *lfsck_oinfo; #ifdef RESOURCE_TRACK /* @@ -289,28 +383,48 @@ 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 fs_fragmented_dir; + __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; + enum shared_opt shared; + enum clone_opt clone; + profile_t profile; + int blocks_per_page; + + /* Expand large inodes to atleast these many bytes */ + int want_extra_isize; + /* minimum i_extra_isize found in used inodes. Should not be lesser + * than s_min_extra_isize. + */ + __u32 min_extra_isize; + int fs_unexpanded_inodes; + ext2fs_inode_bitmap expand_eisize_map; /* * For the use of callers of the e2fsck functions; not used by @@ -323,6 +437,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 */ @@ -333,6 +452,7 @@ extern void e2fsck_pass2(e2fsck_t ctx); extern void e2fsck_pass3(e2fsck_t ctx); extern void e2fsck_pass4(e2fsck_t ctx); extern void e2fsck_pass5(e2fsck_t ctx); +extern void e2fsck_pass6(e2fsck_t ctx); /* e2fsck.c */ extern errcode_t e2fsck_allocate_context(e2fsck_t *ret); @@ -344,14 +464,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); @@ -383,13 +515,30 @@ 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); + +/* logfile.c */ +extern void set_up_logging(e2fsck_t ctx); + +/* quota.c */ +extern void e2fsck_hide_quota(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); +#define e2fsck_mark_inode_bad(ctx, ino, count) \ + e2fsck_mark_inode_bad_loc(ctx, ino, count, __func__, __LINE__) +extern void e2fsck_mark_inode_bad_loc(e2fsck_t ctx, ino_t ino, int count, + const char *func, const int line); +extern int is_inode_bad(e2fsck_t ctx, ino_t ino); /* pass2.c */ extern int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir, @@ -400,6 +549,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 */ @@ -411,38 +562,86 @@ extern int region_allocate(region_t region, region_addr_t start, int n); errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino); void e2fsck_rehash_directories(e2fsck_t ctx); +/* sigcatcher.c */ +void sigcatcher_setup(void); + /* 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); +void check_resize_inode(e2fsck_t ctx); /* util.c */ extern void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size, const char *description); extern int ask(e2fsck_t ctx, const char * string, int def); -extern int ask_yn(const char * string, int def); +extern int ask_yn(e2fsck_t ctx, const char * string, int def); extern void fatal_error(e2fsck_t ctx, const char * fmt_string); +extern void log_out(e2fsck_t ctx, const char *fmt, ...) + E2FSCK_ATTR((format(printf, 2, 3))); +extern void log_err(e2fsck_t ctx, const char *fmt, ...) + E2FSCK_ATTR((format(printf, 2, 3))); 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); +extern int fs_proc_check(const char *fs_name); +extern int check_for_modules(const char *fs_name); #ifdef RESOURCE_TRACK -extern void print_resource_track(const char *desc, - struct resource_track *track); -extern void init_resource_track(struct resource_track *track); +extern void print_resource_track(e2fsck_t ctx, + const char *desc, + struct resource_track *track, + io_channel channel); +extern void init_resource_track(struct resource_track *track, + io_channel channel); +#else +#define print_resource_track(ctx, desc, track, channel) do { } while (0) +#define init_resource_track(track, channel) do { } while (0) #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 extern blk_t get_backup_sb(e2fsck_t ctx, ext2_filsys fs, const char *name, io_manager manager); extern int ext2_file_type(unsigned int mode); +extern int write_all(int fd, char *buf, size_t count); +void dump_mmp_msg(struct mmp_struct *mmp, const char *msg); +errcode_t e2fsck_mmp_update(ext2_filsys fs); + +extern void e2fsck_set_bitmap_type(ext2_filsys fs, + unsigned int default_type, + const char *profile_name, + unsigned int *old_type); +extern errcode_t e2fsck_allocate_inode_bitmap(ext2_filsys fs, + const char *descr, + int default_type, + const char *profile_name, + ext2fs_inode_bitmap *ret); +extern errcode_t e2fsck_allocate_block_bitmap(ext2_filsys fs, + const char *descr, + int default_type, + const char *profile_name, + ext2fs_block_bitmap *ret); +extern errcode_t e2fsck_allocate_subcluster_bitmap(ext2_filsys fs, + const char *descr, + int default_type, + const char *profile_name, + ext2fs_block_bitmap *ret); /* 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 */