Ext2fs cleanup from Garrett Kajmowicz.
This commit is contained in:
Rob Landley
parent
5cf905a871
commit
43ac88849b
@ -35,40 +35,8 @@
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE 1 /* get strnlen() */
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <setjmp.h>
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
#include <assert.h>
|
||||
#include <signal.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <malloc.h>
|
||||
#include <termios.h>
|
||||
#include <mntent.h>
|
||||
#include <dirent.h>
|
||||
|
||||
#include "fsck.h"
|
||||
|
||||
#include "ext2fs/ext2_fs.h"
|
||||
#include "ext2fs/ext2fs.h"
|
||||
#include "blkid/blkid.h"
|
||||
#include "ext2fs/ext2_ext_attr.h"
|
||||
#include "uuid/uuid.h"
|
||||
#include "e2fsck.h" /*Put all of our defines here to clean things up*/
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define _INLINE_ __inline__
|
||||
@ -78,274 +46,6 @@
|
||||
#define EXT2FS_ATTR(x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The last ext2fs revision level that this version of e2fsck is able to
|
||||
* support
|
||||
*/
|
||||
#define E2FSCK_CURRENT_REV 1
|
||||
|
||||
/*
|
||||
* The directory information structure; stores directory information
|
||||
* collected in earlier passes, to avoid disk i/o in fetching the
|
||||
* directory information.
|
||||
*/
|
||||
struct dir_info {
|
||||
ext2_ino_t ino; /* Inode number */
|
||||
ext2_ino_t dotdot; /* Parent according to '..' */
|
||||
ext2_ino_t parent; /* Parent according to treewalk */
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* The indexed directory information structure; stores information for
|
||||
* directories which contain a hash tree index.
|
||||
*/
|
||||
struct dx_dir_info {
|
||||
ext2_ino_t ino; /* Inode number */
|
||||
int numblocks; /* number of blocks */
|
||||
int hashversion;
|
||||
short depth; /* depth of tree */
|
||||
struct dx_dirblock_info *dx_block; /* Array of size numblocks */
|
||||
};
|
||||
|
||||
#define DX_DIRBLOCK_ROOT 1
|
||||
#define DX_DIRBLOCK_LEAF 2
|
||||
#define DX_DIRBLOCK_NODE 3
|
||||
#define DX_DIRBLOCK_CORRUPT 4
|
||||
#define DX_DIRBLOCK_CLEARED 8
|
||||
|
||||
struct dx_dirblock_info {
|
||||
int type;
|
||||
blk_t phys;
|
||||
int flags;
|
||||
blk_t parent;
|
||||
ext2_dirhash_t min_hash;
|
||||
ext2_dirhash_t max_hash;
|
||||
ext2_dirhash_t node_min_hash;
|
||||
ext2_dirhash_t node_max_hash;
|
||||
};
|
||||
|
||||
#define DX_FLAG_REFERENCED 1
|
||||
#define DX_FLAG_DUP_REF 2
|
||||
#define DX_FLAG_FIRST 4
|
||||
#define DX_FLAG_LAST 8
|
||||
|
||||
#ifdef RESOURCE_TRACK
|
||||
/*
|
||||
* This structure is used for keeping track of how much resources have
|
||||
* been used for a particular pass of e2fsck.
|
||||
*/
|
||||
struct resource_track {
|
||||
struct timeval time_start;
|
||||
struct timeval user_start;
|
||||
struct timeval system_start;
|
||||
void *brk_start;
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
* E2fsck options
|
||||
*/
|
||||
#define E2F_OPT_READONLY 0x0001
|
||||
#define E2F_OPT_PREEN 0x0002
|
||||
#define E2F_OPT_YES 0x0004
|
||||
#define E2F_OPT_NO 0x0008
|
||||
#define E2F_OPT_TIME 0x0010
|
||||
#define E2F_OPT_TIME2 0x0020
|
||||
#define E2F_OPT_CHECKBLOCKS 0x0040
|
||||
#define E2F_OPT_DEBUG 0x0080
|
||||
#define E2F_OPT_FORCE 0x0100
|
||||
#define E2F_OPT_WRITECHECK 0x0200
|
||||
#define E2F_OPT_COMPRESS_DIRS 0x0400
|
||||
|
||||
/*
|
||||
* E2fsck flags
|
||||
*/
|
||||
#define E2F_FLAG_ABORT 0x0001 /* Abort signaled */
|
||||
#define E2F_FLAG_CANCEL 0x0002 /* Cancel signaled */
|
||||
#define E2F_FLAG_SIGNAL_MASK 0x0003
|
||||
#define E2F_FLAG_RESTART 0x0004 /* Restart signaled */
|
||||
|
||||
#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
|
||||
* specified by the user */
|
||||
#define E2F_FLAG_RESTARTED 0x0200 /* E2fsck has been restarted */
|
||||
#define E2F_FLAG_RESIZE_INODE 0x0400 /* Request to recreate resize inode */
|
||||
|
||||
/*
|
||||
* Defines for indicating the e2fsck pass number
|
||||
*/
|
||||
#define E2F_PASS_1 1
|
||||
#define E2F_PASS_2 2
|
||||
#define E2F_PASS_3 3
|
||||
#define E2F_PASS_4 4
|
||||
#define E2F_PASS_5 5
|
||||
#define E2F_PASS_1B 6
|
||||
|
||||
|
||||
/*
|
||||
* This is the global e2fsck structure.
|
||||
*/
|
||||
typedef struct e2fsck_struct *e2fsck_t;
|
||||
|
||||
/*
|
||||
* Define the extended attribute refcount structure
|
||||
*/
|
||||
typedef struct ea_refcount *ext2_refcount_t;
|
||||
|
||||
struct e2fsck_struct {
|
||||
ext2_filsys fs;
|
||||
const char *program_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 */
|
||||
|
||||
jmp_buf abort_loc;
|
||||
|
||||
unsigned long abort_code;
|
||||
|
||||
int (*progress)(e2fsck_t ctx, int pass, unsigned long cur,
|
||||
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_block_bitmap block_found_map; /* Blocks which are in use */
|
||||
ext2fs_block_bitmap block_dup_map; /* Blks referenced more than once */
|
||||
ext2fs_block_bitmap block_ea_map; /* Blocks which are used by EA's */
|
||||
|
||||
/*
|
||||
* Inode count arrays
|
||||
*/
|
||||
ext2_icount_t inode_count;
|
||||
ext2_icount_t inode_link_info;
|
||||
|
||||
ext2_refcount_t refcount;
|
||||
ext2_refcount_t refcount_extra;
|
||||
|
||||
/*
|
||||
* Array of flags indicating whether an inode bitmap, block
|
||||
* bitmap, or inode table is invalid
|
||||
*/
|
||||
int *invalid_inode_bitmap_flag;
|
||||
int *invalid_block_bitmap_flag;
|
||||
int *invalid_inode_table_flag;
|
||||
int invalid_bitmaps; /* There are invalid bitmaps/itable */
|
||||
|
||||
/*
|
||||
* Block buffer
|
||||
*/
|
||||
char *block_buf;
|
||||
|
||||
/*
|
||||
* For pass1_check_directory and pass1_get_blocks
|
||||
*/
|
||||
ext2_ino_t stashed_ino;
|
||||
struct ext2_inode *stashed_inode;
|
||||
|
||||
/*
|
||||
* Location of the lost and found directory
|
||||
*/
|
||||
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;
|
||||
|
||||
/*
|
||||
* Indexed directory information
|
||||
*/
|
||||
int dx_dir_info_count;
|
||||
int dx_dir_info_size;
|
||||
struct dx_dir_info *dx_dir_info;
|
||||
|
||||
/*
|
||||
* Directories to hash
|
||||
*/
|
||||
ext2_u32_list dirs_to_hash;
|
||||
|
||||
/*
|
||||
* Tuning parameters
|
||||
*/
|
||||
int process_inode_size;
|
||||
int inode_buffer_blocks;
|
||||
|
||||
/*
|
||||
* ext3 journal support
|
||||
*/
|
||||
io_channel journal_io;
|
||||
char *journal_name;
|
||||
|
||||
#ifdef RESOURCE_TRACK
|
||||
/*
|
||||
* For timing purposes
|
||||
*/
|
||||
struct resource_track global_rtrack;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* How we display the progress update (for unix)
|
||||
*/
|
||||
int progress_fd;
|
||||
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;
|
||||
|
||||
int ext_attr_ver;
|
||||
|
||||
/*
|
||||
* For the use of callers of the e2fsck functions; not used by
|
||||
* e2fsck functions themselves.
|
||||
*/
|
||||
void *priv_data;
|
||||
};
|
||||
|
||||
/* Used by the region allocation code */
|
||||
typedef __u32 region_addr_t;
|
||||
typedef struct region_struct *region_t;
|
||||
|
||||
/*
|
||||
* Procedure declarations
|
||||
*/
|
||||
@ -395,6 +95,8 @@ static blk_t get_backup_sb(e2fsck_t ctx, ext2_filsys fs,
|
||||
static void e2fsck_clear_progbar(e2fsck_t ctx);
|
||||
static int e2fsck_simple_progress(e2fsck_t ctx, const char *label,
|
||||
float percent, unsigned int dpynum);
|
||||
|
||||
|
||||
/*
|
||||
* problem.h --- e2fsck problem error codes
|
||||
*/
|
||||
@ -1349,7 +1051,6 @@ typedef struct dict_load_t {
|
||||
* Pull in the definition of the e2fsck context structure
|
||||
*/
|
||||
|
||||
|
||||
struct buffer_head {
|
||||
char b_data[8192];
|
||||
e2fsck_t b_ctx;
|
||||
@ -1361,22 +1062,10 @@ struct buffer_head {
|
||||
int b_err;
|
||||
};
|
||||
|
||||
struct inode {
|
||||
e2fsck_t i_ctx;
|
||||
ext2_ino_t i_ino;
|
||||
struct ext2_inode i_ext2;
|
||||
};
|
||||
|
||||
struct kdev_s {
|
||||
e2fsck_t k_ctx;
|
||||
int k_dev;
|
||||
};
|
||||
|
||||
#define K_DEV_FS 1
|
||||
#define K_DEV_JOURNAL 2
|
||||
|
||||
typedef struct kdev_s *kdev_t;
|
||||
|
||||
#define lock_buffer(bh) do {} while(0)
|
||||
#define unlock_buffer(bh) do {} while(0)
|
||||
#define buffer_req(bh) 1
|
||||
@ -1410,11 +1099,6 @@ static _INLINE_ void do_cache_destroy(kmem_cache_t *cache)
|
||||
free(cache);
|
||||
}
|
||||
|
||||
/*
|
||||
* Now pull in the real linux/jfs.h definitions.
|
||||
*/
|
||||
#include "ext2fs/kernel-jbd.h"
|
||||
|
||||
/*
|
||||
* badblocks.c --- replace/append bad blocks to the bad block inode
|
||||
*/
|
||||
@ -2720,11 +2404,6 @@ static void ehandler_init(io_channel channel)
|
||||
|
||||
#define MNT_FL (MS_MGC_VAL | MS_RDONLY)
|
||||
|
||||
|
||||
#ifdef __CONFIG_JBD_DEBUG__E2FS /* Enabled by configure --enable-jfs-debug */
|
||||
static int bh_count = 0;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Define USE_INODE_IO to use the inode_io.c / fileio.c codepaths.
|
||||
* This creates a larger static binary, and a smaller binary using
|
||||
@ -2768,9 +2447,6 @@ static struct buffer_head *getblk(kdev_t kdev, blk_t blocknr, int blocksize)
|
||||
if (!bh)
|
||||
return NULL;
|
||||
|
||||
jfs_debug(4, "getblk for block %lu (%d bytes)(total %d)\n",
|
||||
(unsigned long) blocknr, blocksize, ++bh_count);
|
||||
|
||||
bh->b_ctx = kdev->k_ctx;
|
||||
if (kdev->k_dev == K_DEV_FS)
|
||||
bh->b_io = kdev->k_ctx->fs->io;
|
||||
@ -2802,8 +2478,6 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[])
|
||||
for (; nr > 0; --nr) {
|
||||
bh = *bhp++;
|
||||
if (rw == READ && !bh->b_uptodate) {
|
||||
jfs_debug(3, "reading block %lu/%p\n",
|
||||
(unsigned long) bh->b_blocknr, (void *) bh);
|
||||
retval = io_channel_read_blk(bh->b_io,
|
||||
bh->b_blocknr,
|
||||
1, bh->b_data);
|
||||
@ -2816,8 +2490,6 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[])
|
||||
}
|
||||
bh->b_uptodate = 1;
|
||||
} else if (rw == WRITE && bh->b_dirty) {
|
||||
jfs_debug(3, "writing block %lu/%p\n",
|
||||
(unsigned long) bh->b_blocknr, (void *) bh);
|
||||
retval = io_channel_write_blk(bh->b_io,
|
||||
bh->b_blocknr,
|
||||
1, bh->b_data);
|
||||
@ -2830,10 +2502,6 @@ static void ll_rw_block(int rw, int nr, struct buffer_head *bhp[])
|
||||
}
|
||||
bh->b_dirty = 0;
|
||||
bh->b_uptodate = 1;
|
||||
} else {
|
||||
jfs_debug(3, "no-op %s for block %lu\n",
|
||||
rw == READ ? "read" : "write",
|
||||
(unsigned long) bh->b_blocknr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2852,8 +2520,6 @@ static void brelse(struct buffer_head *bh)
|
||||
{
|
||||
if (bh->b_dirty)
|
||||
ll_rw_block(WRITE, 1, &bh);
|
||||
jfs_debug(3, "freeing block %lu/%p (total %d)\n",
|
||||
(unsigned long) bh->b_blocknr, (void *) bh, --bh_count);
|
||||
ext2fs_free_mem(&bh);
|
||||
}
|
||||
|
||||
@ -3012,14 +2678,9 @@ static errcode_t e2fsck_get_journal(e2fsck_t ctx, journal_t **ret_journal)
|
||||
return EXT2_ET_LOAD_EXT_JOURNAL;
|
||||
}
|
||||
|
||||
jfs_debug(1, "Using journal file %s\n", journal_name);
|
||||
io_ptr = unix_io_manager;
|
||||
}
|
||||
|
||||
#if 0
|
||||
test_io_backing_manager = io_ptr;
|
||||
io_ptr = test_io_manager;
|
||||
#endif
|
||||
#ifndef USE_INODE_IO
|
||||
if (ext_journal)
|
||||
#endif
|
||||
@ -11681,13 +11342,10 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
|
||||
|
||||
*bhp = NULL;
|
||||
|
||||
J_ASSERT (offset < journal->j_maxlen);
|
||||
|
||||
err = journal_bmap(journal, offset, &blocknr);
|
||||
|
||||
if (err) {
|
||||
printk (KERN_ERR "JBD: bad block at offset %u\n",
|
||||
offset);
|
||||
printf ("JBD: bad block at offset %u\n", offset);
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -11704,8 +11362,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
|
||||
}
|
||||
|
||||
if (!buffer_uptodate(bh)) {
|
||||
printk (KERN_ERR "JBD: Failed to read block at offset %u\n",
|
||||
offset);
|
||||
printf ("JBD: Failed to read block at offset %u\n", offset);
|
||||
brelse(bh);
|
||||
return -EIO;
|
||||
}
|
||||
@ -11779,8 +11436,6 @@ int journal_recover(journal_t *journal)
|
||||
*/
|
||||
|
||||
if (!sb->s_start) {
|
||||
jbd_debug(1, "No recovery required, last transaction %d\n",
|
||||
ntohl(sb->s_sequence));
|
||||
journal->j_transaction_sequence = ntohl(sb->s_sequence) + 1;
|
||||
return 0;
|
||||
}
|
||||
@ -11791,12 +11446,6 @@ int journal_recover(journal_t *journal)
|
||||
if (!err)
|
||||
err = do_one_pass(journal, &info, PASS_REPLAY);
|
||||
|
||||
jbd_debug(0, "JBD: recovery, exit status %d, "
|
||||
"recovered transactions %u to %u\n",
|
||||
err, info.start_transaction, info.end_transaction);
|
||||
jbd_debug(0, "JBD: Replayed %d and revoked %d/%d blocks\n",
|
||||
info.nr_replays, info.nr_revoke_hits, info.nr_revokes);
|
||||
|
||||
/* Restart the log at the next transaction ID, thus invalidating
|
||||
* any existing commit records in the log. */
|
||||
journal->j_transaction_sequence = ++info.end_transaction;
|
||||
@ -11837,8 +11486,6 @@ static int do_one_pass(journal_t *journal,
|
||||
if (pass == PASS_SCAN)
|
||||
info->start_transaction = first_commit_ID;
|
||||
|
||||
jbd_debug(1, "Starting recovery pass %d\n", pass);
|
||||
|
||||
/*
|
||||
* Now we walk through the log, transaction by transaction,
|
||||
* making sure that each transaction has a commit block in the
|
||||
@ -11861,14 +11508,10 @@ static int do_one_pass(journal_t *journal,
|
||||
if (tid_geq(next_commit_ID, info->end_transaction))
|
||||
break;
|
||||
|
||||
jbd_debug(2, "Scanning for sequence ID %u at %lu/%lu\n",
|
||||
next_commit_ID, next_log_block, journal->j_last);
|
||||
|
||||
/* Skip over each chunk of the transaction looking
|
||||
* either the next descriptor block or the final commit
|
||||
* record. */
|
||||
|
||||
jbd_debug(3, "JBD: checking block %ld\n", next_log_block);
|
||||
err = jread(&bh, journal, next_log_block);
|
||||
if (err)
|
||||
goto failed;
|
||||
@ -11891,8 +11534,6 @@ static int do_one_pass(journal_t *journal,
|
||||
|
||||
blocktype = ntohl(tmp->h_blocktype);
|
||||
sequence = ntohl(tmp->h_sequence);
|
||||
jbd_debug(3, "Found magic %d, sequence %d\n",
|
||||
blocktype, sequence);
|
||||
|
||||
if (sequence != next_commit_ID) {
|
||||
brelse(bh);
|
||||
@ -11935,14 +11576,12 @@ static int do_one_pass(journal_t *journal,
|
||||
/* Recover what we can, but
|
||||
* report failure at the end. */
|
||||
success = err;
|
||||
printk (KERN_ERR
|
||||
"JBD: IO error %d recovering "
|
||||
printf ("JBD: IO error %d recovering "
|
||||
"block %ld in log\n",
|
||||
err, io_block);
|
||||
} else {
|
||||
unsigned long blocknr;
|
||||
|
||||
J_ASSERT(obh != NULL);
|
||||
blocknr = ntohl(tag->t_blocknr);
|
||||
|
||||
/* If the block has been
|
||||
@ -11962,8 +11601,7 @@ static int do_one_pass(journal_t *journal,
|
||||
blocknr,
|
||||
journal->j_blocksize);
|
||||
if (nbh == NULL) {
|
||||
printk(KERN_ERR
|
||||
"JBD: Out of memory "
|
||||
printf ("JBD: Out of memory "
|
||||
"during recovery.\n");
|
||||
err = -ENOMEM;
|
||||
brelse(bh);
|
||||
@ -11979,10 +11617,8 @@ static int do_one_pass(journal_t *journal,
|
||||
htonl(JFS_MAGIC_NUMBER);
|
||||
}
|
||||
|
||||
BUFFER_TRACE(nbh, "marking dirty");
|
||||
mark_buffer_uptodate(nbh, 1);
|
||||
mark_buffer_dirty(nbh);
|
||||
BUFFER_TRACE(nbh, "marking uptodate");
|
||||
++info->nr_replays;
|
||||
/* ll_rw_block(WRITE, 1, &nbh); */
|
||||
unlock_buffer(nbh);
|
||||
@ -12026,8 +11662,6 @@ static int do_one_pass(journal_t *journal,
|
||||
continue;
|
||||
|
||||
default:
|
||||
jbd_debug(3, "Unrecognised magic %d, end of scan.\n",
|
||||
blocktype);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
@ -12046,7 +11680,7 @@ static int do_one_pass(journal_t *journal,
|
||||
/* It's really bad news if different passes end up at
|
||||
* different places (but possible due to IO errors). */
|
||||
if (info->end_transaction != next_commit_ID) {
|
||||
printk (KERN_ERR "JBD: recovery pass %d ended at "
|
||||
printf ("JBD: recovery pass %d ended at "
|
||||
"transaction %u, expected %u\n",
|
||||
pass, next_commit_ID, info->end_transaction);
|
||||
if (!success)
|
||||
@ -13067,15 +12701,11 @@ int journal_init_revoke(journal_t *journal, int hash_size)
|
||||
{
|
||||
int shift, tmp;
|
||||
|
||||
J_ASSERT (journal->j_revoke == NULL);
|
||||
|
||||
journal->j_revoke = kmem_cache_alloc(revoke_table_cache, GFP_KERNEL);
|
||||
if (!journal->j_revoke)
|
||||
return -ENOMEM;
|
||||
|
||||
/* Check that the hash_size is a power of two */
|
||||
J_ASSERT ((hash_size & (hash_size-1)) == 0);
|
||||
|
||||
journal->j_revoke->hash_size = hash_size;
|
||||
|
||||
shift = 0;
|
||||
@ -13111,7 +12741,6 @@ void journal_destroy_revoke(journal_t *journal)
|
||||
|
||||
for (i=0; i<table->hash_size; i++) {
|
||||
hash_list = &table->hash_table[i];
|
||||
J_ASSERT (list_empty(hash_list));
|
||||
}
|
||||
|
||||
free(table->hash_table);
|
||||
@ -14158,15 +13787,6 @@ static void swap_filesys(e2fsck_t ctx)
|
||||
* util.c --- miscellaneous utilities
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONIO_H
|
||||
#undef HAVE_TERMIOS_H
|
||||
#include <conio.h>
|
||||
#define read_a_char() getch()
|
||||
#else
|
||||
#ifdef HAVE_TERMIOS_H
|
||||
#include <termios.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
void fatal_error(e2fsck_t ctx, const char *msg)
|
||||
|
||||
351
e2fsprogs/e2fsck.h
Normal file
351
e2fsprogs/e2fsck.h
Normal file
@ -0,0 +1,351 @@
|
||||
#include <sys/types.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <setjmp.h>
|
||||
#include <errno.h>
|
||||
#include <getopt.h>
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
#include <assert.h>
|
||||
#include <signal.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <malloc.h>
|
||||
#include <termios.h>
|
||||
#include <mntent.h>
|
||||
#include <dirent.h>
|
||||
#include "ext2fs/kernel-list.h"
|
||||
#include <sys/types.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
|
||||
/*
|
||||
* Now pull in the real linux/jfs.h definitions.
|
||||
*/
|
||||
#include "ext2fs/kernel-jbd.h"
|
||||
|
||||
|
||||
|
||||
#include "fsck.h"
|
||||
|
||||
#include "ext2fs/ext2_fs.h"
|
||||
#include "blkid/blkid.h"
|
||||
#include "ext2fs/ext2_ext_attr.h"
|
||||
#include "uuid/uuid.h"
|
||||
|
||||
#ifdef HAVE_CONIO_H
|
||||
#undef HAVE_TERMIOS_H
|
||||
#include <conio.h>
|
||||
#define read_a_char() getch()
|
||||
#else
|
||||
#ifdef HAVE_TERMIOS_H
|
||||
#include <termios.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* The last ext2fs revision level that this version of e2fsck is able to
|
||||
* support
|
||||
*/
|
||||
#define E2FSCK_CURRENT_REV 1
|
||||
|
||||
/* Used by the region allocation code */
|
||||
typedef __u32 region_addr_t;
|
||||
typedef struct region_struct *region_t;
|
||||
|
||||
struct dx_dirblock_info {
|
||||
int type;
|
||||
blk_t phys;
|
||||
int flags;
|
||||
blk_t parent;
|
||||
ext2_dirhash_t min_hash;
|
||||
ext2_dirhash_t max_hash;
|
||||
ext2_dirhash_t node_min_hash;
|
||||
ext2_dirhash_t node_max_hash;
|
||||
};
|
||||
|
||||
/*
|
||||
These defines are used in the type field of dx_dirblock_info
|
||||
*/
|
||||
|
||||
#define DX_DIRBLOCK_ROOT 1
|
||||
#define DX_DIRBLOCK_LEAF 2
|
||||
#define DX_DIRBLOCK_NODE 3
|
||||
#define DX_DIRBLOCK_CORRUPT 4
|
||||
#define DX_DIRBLOCK_CLEARED 8
|
||||
|
||||
|
||||
/*
|
||||
The following defines are used in the 'flags' field of a dx_dirblock_info
|
||||
*/
|
||||
#define DX_FLAG_REFERENCED 1
|
||||
#define DX_FLAG_DUP_REF 2
|
||||
#define DX_FLAG_FIRST 4
|
||||
#define DX_FLAG_LAST 8
|
||||
|
||||
#ifdef RESOURCE_TRACK
|
||||
/*
|
||||
* This structure is used for keeping track of how much resources have
|
||||
* been used for a particular pass of e2fsck.
|
||||
*/
|
||||
struct resource_track {
|
||||
struct timeval time_start;
|
||||
struct timeval user_start;
|
||||
struct timeval system_start;
|
||||
void *brk_start;
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
* E2fsck options
|
||||
*/
|
||||
#define E2F_OPT_READONLY 0x0001
|
||||
#define E2F_OPT_PREEN 0x0002
|
||||
#define E2F_OPT_YES 0x0004
|
||||
#define E2F_OPT_NO 0x0008
|
||||
#define E2F_OPT_TIME 0x0010
|
||||
#define E2F_OPT_TIME2 0x0020
|
||||
#define E2F_OPT_CHECKBLOCKS 0x0040
|
||||
#define E2F_OPT_DEBUG 0x0080
|
||||
#define E2F_OPT_FORCE 0x0100
|
||||
#define E2F_OPT_WRITECHECK 0x0200
|
||||
#define E2F_OPT_COMPRESS_DIRS 0x0400
|
||||
|
||||
/*
|
||||
* E2fsck flags
|
||||
*/
|
||||
#define E2F_FLAG_ABORT 0x0001 /* Abort signaled */
|
||||
#define E2F_FLAG_CANCEL 0x0002 /* Cancel signaled */
|
||||
#define E2F_FLAG_SIGNAL_MASK 0x0003
|
||||
#define E2F_FLAG_RESTART 0x0004 /* Restart signaled */
|
||||
|
||||
#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
|
||||
* specified by the user */
|
||||
#define E2F_FLAG_RESTARTED 0x0200 /* E2fsck has been restarted */
|
||||
#define E2F_FLAG_RESIZE_INODE 0x0400 /* Request to recreate resize inode */
|
||||
|
||||
/*
|
||||
* Defines for indicating the e2fsck pass number
|
||||
*/
|
||||
#define E2F_PASS_1 1
|
||||
#define E2F_PASS_2 2
|
||||
#define E2F_PASS_3 3
|
||||
#define E2F_PASS_4 4
|
||||
#define E2F_PASS_5 5
|
||||
#define E2F_PASS_1B 6
|
||||
|
||||
/*Don't know where these come from*/
|
||||
#define READ 0
|
||||
#define WRITE 1
|
||||
#define KERN_ERR ""
|
||||
#define KERN_DEBUG ""
|
||||
#define cpu_to_be32(n) htonl(n)
|
||||
#define be32_to_cpu(n) ntohl(n)
|
||||
|
||||
|
||||
/*
|
||||
* The directory information structure; stores directory information
|
||||
* collected in earlier passes, to avoid disk i/o in fetching the
|
||||
* directory information.
|
||||
*/
|
||||
struct dir_info {
|
||||
ext2_ino_t ino; /* Inode number */
|
||||
ext2_ino_t dotdot; /* Parent according to '..' */
|
||||
ext2_ino_t parent; /* Parent according to treewalk */
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* The indexed directory information structure; stores information for
|
||||
* directories which contain a hash tree index.
|
||||
*/
|
||||
struct dx_dir_info {
|
||||
ext2_ino_t ino; /* Inode number */
|
||||
int numblocks; /* number of blocks */
|
||||
int hashversion;
|
||||
short depth; /* depth of tree */
|
||||
struct dx_dirblock_info *dx_block; /* Array of size numblocks */
|
||||
};
|
||||
|
||||
/*
|
||||
* Define the extended attribute refcount structure
|
||||
*/
|
||||
typedef struct ea_refcount *ext2_refcount_t;
|
||||
|
||||
struct e2fsck_struct {
|
||||
ext2_filsys fs;
|
||||
const char *program_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 */
|
||||
|
||||
jmp_buf abort_loc;
|
||||
|
||||
unsigned long abort_code;
|
||||
|
||||
int (*progress)(e2fsck_t ctx, int pass, unsigned long cur,
|
||||
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_block_bitmap block_found_map; /* Blocks which are in use */
|
||||
ext2fs_block_bitmap block_dup_map; /* Blks referenced more than once */
|
||||
ext2fs_block_bitmap block_ea_map; /* Blocks which are used by EA's */
|
||||
|
||||
/*
|
||||
* Inode count arrays
|
||||
*/
|
||||
ext2_icount_t inode_count;
|
||||
ext2_icount_t inode_link_info;
|
||||
|
||||
ext2_refcount_t refcount;
|
||||
ext2_refcount_t refcount_extra;
|
||||
|
||||
/*
|
||||
* Array of flags indicating whether an inode bitmap, block
|
||||
* bitmap, or inode table is invalid
|
||||
*/
|
||||
int *invalid_inode_bitmap_flag;
|
||||
int *invalid_block_bitmap_flag;
|
||||
int *invalid_inode_table_flag;
|
||||
int invalid_bitmaps; /* There are invalid bitmaps/itable */
|
||||
|
||||
/*
|
||||
* Block buffer
|
||||
*/
|
||||
char *block_buf;
|
||||
|
||||
/*
|
||||
* For pass1_check_directory and pass1_get_blocks
|
||||
*/
|
||||
ext2_ino_t stashed_ino;
|
||||
struct ext2_inode *stashed_inode;
|
||||
|
||||
/*
|
||||
* Location of the lost and found directory
|
||||
*/
|
||||
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;
|
||||
|
||||
/*
|
||||
* Indexed directory information
|
||||
*/
|
||||
int dx_dir_info_count;
|
||||
int dx_dir_info_size;
|
||||
struct dx_dir_info *dx_dir_info;
|
||||
|
||||
/*
|
||||
* Directories to hash
|
||||
*/
|
||||
ext2_u32_list dirs_to_hash;
|
||||
|
||||
/*
|
||||
* Tuning parameters
|
||||
*/
|
||||
int process_inode_size;
|
||||
int inode_buffer_blocks;
|
||||
|
||||
/*
|
||||
* ext3 journal support
|
||||
*/
|
||||
io_channel journal_io;
|
||||
char *journal_name;
|
||||
|
||||
#ifdef RESOURCE_TRACK
|
||||
/*
|
||||
* For timing purposes
|
||||
*/
|
||||
struct resource_track global_rtrack;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* How we display the progress update (for unix)
|
||||
*/
|
||||
int progress_fd;
|
||||
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;
|
||||
|
||||
int ext_attr_ver;
|
||||
|
||||
/*
|
||||
* For the use of callers of the e2fsck functions; not used by
|
||||
* e2fsck functions themselves.
|
||||
*/
|
||||
void *priv_data;
|
||||
};
|
||||
|
||||
|
||||
|
||||
static inline int tid_gt(tid_t x, tid_t y)
|
||||
{
|
||||
int difference = (x - y);
|
||||
return (difference > 0);
|
||||
}
|
||||
|
||||
static inline int tid_geq(tid_t x, tid_t y)
|
||||
{
|
||||
int difference = (x - y);
|
||||
return (difference >= 0);
|
||||
}
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
|
||||
#include "ext2fs.h"
|
||||
#include "bitops.h"
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
* Allocate memory
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
|
||||
#ifndef _JFS_COMPAT_H
|
||||
#define _JFS_COMPAT_H
|
||||
|
||||
#include "kernel-list.h"
|
||||
#include <errno.h>
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
#define printk printf
|
||||
#define KERN_ERR ""
|
||||
#define KERN_DEBUG ""
|
||||
|
||||
#define READ 0
|
||||
#define WRITE 1
|
||||
|
||||
#define cpu_to_be32(n) htonl(n)
|
||||
#define be32_to_cpu(n) ntohl(n)
|
||||
|
||||
typedef unsigned int tid_t;
|
||||
typedef struct journal_s journal_t;
|
||||
|
||||
struct buffer_head;
|
||||
struct inode;
|
||||
|
||||
struct journal_s
|
||||
{
|
||||
unsigned long j_flags;
|
||||
int j_errno;
|
||||
struct buffer_head * j_sb_buffer;
|
||||
struct journal_superblock_s *j_superblock;
|
||||
int j_format_version;
|
||||
unsigned long j_head;
|
||||
unsigned long j_tail;
|
||||
unsigned long j_free;
|
||||
unsigned long j_first, j_last;
|
||||
kdev_t j_dev;
|
||||
kdev_t j_fs_dev;
|
||||
int j_blocksize;
|
||||
unsigned int j_blk_offset;
|
||||
unsigned int j_maxlen;
|
||||
struct inode * j_inode;
|
||||
tid_t j_tail_sequence;
|
||||
tid_t j_transaction_sequence;
|
||||
__u8 j_uuid[16];
|
||||
struct jbd_revoke_table_s *j_revoke;
|
||||
};
|
||||
|
||||
#define J_ASSERT(assert) \
|
||||
do { if (!(assert)) { \
|
||||
printf ("Assertion failure in %s() at %s line %d: " \
|
||||
"\"%s\"\n", \
|
||||
__FUNCTION__, __FILE__, __LINE__, # assert); \
|
||||
fatal_error(e2fsck_global_ctx, 0); \
|
||||
} } while (0)
|
||||
|
||||
#define is_journal_abort(x) 0
|
||||
|
||||
#define BUFFER_TRACE(bh, info) do {} while (0)
|
||||
|
||||
/* Need this so we can compile with configure --enable-gcc-wall */
|
||||
#ifdef NO_INLINE_FUNCS
|
||||
#define inline
|
||||
#endif
|
||||
|
||||
#endif /* _JFS_COMPAT_H */
|
||||
@ -1,8 +0,0 @@
|
||||
#ifndef _JFS_USER_H
|
||||
#define _JFS_USER_H
|
||||
|
||||
typedef unsigned short kdev_t;
|
||||
|
||||
#include "kernel-jbd.h"
|
||||
|
||||
#endif /* _JFS_USER_H */
|
||||
@ -16,91 +16,14 @@
|
||||
#ifndef _LINUX_JBD_H
|
||||
#define _LINUX_JBD_H
|
||||
|
||||
#if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || !defined(__KERNEL__)
|
||||
|
||||
/* Allow this file to be included directly into e2fsprogs */
|
||||
#ifndef __KERNEL__
|
||||
#include "jfs_compat.h"
|
||||
#define JFS_DEBUG
|
||||
#define jfs_debug jbd_debug
|
||||
#else
|
||||
|
||||
#include <linux/journal-head.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <asm/semaphore.h>
|
||||
#endif
|
||||
|
||||
#ifndef __GNUC__
|
||||
#define __FUNCTION__ ""
|
||||
#endif
|
||||
|
||||
#define journal_oom_retry 1
|
||||
|
||||
#ifdef __STDC__
|
||||
#ifdef __CONFIG_JBD_DEBUG__E2FS
|
||||
/*
|
||||
* Define JBD_EXPENSIVE_CHECKING to enable more expensive internal
|
||||
* consistency checks. By default we don't do this unless
|
||||
* __CONFIG_JBD_DEBUG__E2FS is on.
|
||||
*/
|
||||
#define JBD_EXPENSIVE_CHECKING
|
||||
extern int journal_enable_debug;
|
||||
|
||||
#define jbd_debug(n, f, a...) \
|
||||
do { \
|
||||
if ((n) <= journal_enable_debug) { \
|
||||
printk (KERN_DEBUG "(%s, %d): %s: ", \
|
||||
__FILE__, __LINE__, __FUNCTION__); \
|
||||
printk (f, ## a); \
|
||||
} \
|
||||
} while (0)
|
||||
#else
|
||||
#ifdef __GNUC__
|
||||
#define jbd_debug(f, a...) /**/
|
||||
#else
|
||||
#define jbd_debug(f, ...) /**/
|
||||
#endif
|
||||
#endif
|
||||
#else
|
||||
#define jbd_debug(x) /* AIX doesn't do STDC */
|
||||
#endif
|
||||
|
||||
extern void * __jbd_kmalloc (char *where, size_t size, int flags, int retry);
|
||||
#define jbd_kmalloc(size, flags) \
|
||||
__jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry)
|
||||
#define jbd_rep_kmalloc(size, flags) \
|
||||
__jbd_kmalloc(__FUNCTION__, (size), (flags), 1)
|
||||
|
||||
#define JFS_MIN_JOURNAL_BLOCKS 1024
|
||||
|
||||
#ifdef __KERNEL__
|
||||
typedef struct handle_s handle_t; /* Atomic operation type */
|
||||
typedef struct journal_s journal_t; /* Journal control structure */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Internal structures used by the logging mechanism:
|
||||
*/
|
||||
|
||||
#define JFS_MAGIC_NUMBER 0xc03b3998U /* The first 4 bytes of /dev/random! */
|
||||
|
||||
/*
|
||||
* On-disk structures
|
||||
*/
|
||||
|
||||
/*
|
||||
* Descriptor block types:
|
||||
*/
|
||||
|
||||
#define JFS_DESCRIPTOR_BLOCK 1
|
||||
#define JFS_COMMIT_BLOCK 2
|
||||
#define JFS_SUPERBLOCK_V1 3
|
||||
#define JFS_SUPERBLOCK_V2 4
|
||||
#define JFS_REVOKE_BLOCK 5
|
||||
#include <sys/types.h>
|
||||
#include <linux/types.h>
|
||||
#include "ext2fs/ext2fs.h"
|
||||
|
||||
/*
|
||||
* Standard header for all descriptor blocks:
|
||||
*/
|
||||
|
||||
typedef struct journal_header_s
|
||||
{
|
||||
__u32 h_magic;
|
||||
@ -108,32 +31,17 @@ typedef struct journal_header_s
|
||||
__u32 h_sequence;
|
||||
} journal_header_t;
|
||||
|
||||
|
||||
/*
|
||||
* The block tag: used to describe a single buffer in the journal
|
||||
* This is the global e2fsck structure.
|
||||
*/
|
||||
typedef struct journal_block_tag_s
|
||||
{
|
||||
__u32 t_blocknr; /* The on-disk block number */
|
||||
__u32 t_flags; /* See below */
|
||||
} journal_block_tag_t;
|
||||
|
||||
/*
|
||||
* The revoke descriptor: used on disk to describe a series of blocks to
|
||||
* be revoked from the log
|
||||
*/
|
||||
typedef struct journal_revoke_header_s
|
||||
{
|
||||
journal_header_t r_header;
|
||||
int r_count; /* Count of bytes used in the block */
|
||||
} journal_revoke_header_t;
|
||||
typedef struct e2fsck_struct *e2fsck_t;
|
||||
|
||||
|
||||
/* Definitions for the journal tag flags word: */
|
||||
#define JFS_FLAG_ESCAPE 1 /* on-disk block is escaped */
|
||||
#define JFS_FLAG_SAME_UUID 2 /* block has same uuid as previous */
|
||||
#define JFS_FLAG_DELETED 4 /* block deleted by this transaction */
|
||||
#define JFS_FLAG_LAST_TAG 8 /* last tag in this descriptor block */
|
||||
struct inode {
|
||||
e2fsck_t i_ctx;
|
||||
ext2_ino_t i_ino;
|
||||
struct ext2_inode i_ext2;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
@ -184,6 +92,58 @@ typedef struct journal_superblock_s
|
||||
/* 0x0400 */
|
||||
} journal_superblock_t;
|
||||
|
||||
|
||||
extern int journal_blocks_per_page(struct inode *inode);
|
||||
extern int jbd_blocks_per_page(struct inode *inode);
|
||||
|
||||
#define JFS_MIN_JOURNAL_BLOCKS 1024
|
||||
|
||||
|
||||
/*
|
||||
* Internal structures used by the logging mechanism:
|
||||
*/
|
||||
|
||||
#define JFS_MAGIC_NUMBER 0xc03b3998U /* The first 4 bytes of /dev/random! */
|
||||
|
||||
/*
|
||||
* Descriptor block types:
|
||||
*/
|
||||
|
||||
#define JFS_DESCRIPTOR_BLOCK 1
|
||||
#define JFS_COMMIT_BLOCK 2
|
||||
#define JFS_SUPERBLOCK_V1 3
|
||||
#define JFS_SUPERBLOCK_V2 4
|
||||
#define JFS_REVOKE_BLOCK 5
|
||||
|
||||
/*
|
||||
* The block tag: used to describe a single buffer in the journal
|
||||
*/
|
||||
typedef struct journal_block_tag_s
|
||||
{
|
||||
__u32 t_blocknr; /* The on-disk block number */
|
||||
__u32 t_flags; /* See below */
|
||||
} journal_block_tag_t;
|
||||
|
||||
/*
|
||||
* The revoke descriptor: used on disk to describe a series of blocks to
|
||||
* be revoked from the log
|
||||
*/
|
||||
typedef struct journal_revoke_header_s
|
||||
{
|
||||
journal_header_t r_header;
|
||||
int r_count; /* Count of bytes used in the block */
|
||||
} journal_revoke_header_t;
|
||||
|
||||
|
||||
/* Definitions for the journal tag flags word: */
|
||||
#define JFS_FLAG_ESCAPE 1 /* on-disk block is escaped */
|
||||
#define JFS_FLAG_SAME_UUID 2 /* block has same uuid as previous */
|
||||
#define JFS_FLAG_DELETED 4 /* block deleted by this transaction */
|
||||
#define JFS_FLAG_LAST_TAG 8 /* last tag in this descriptor block */
|
||||
|
||||
|
||||
|
||||
|
||||
#define JFS_HAS_COMPAT_FEATURE(j,mask) \
|
||||
((j)->j_format_version >= 2 && \
|
||||
((j)->j_superblock->s_feature_compat & cpu_to_be32((mask))))
|
||||
@ -201,615 +161,9 @@ typedef struct journal_superblock_s
|
||||
#define JFS_KNOWN_ROCOMPAT_FEATURES 0
|
||||
#define JFS_KNOWN_INCOMPAT_FEATURES JFS_FEATURE_INCOMPAT_REVOKE
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/fs.h>
|
||||
#include <linux/sched.h>
|
||||
|
||||
#define JBD_ASSERTIONS
|
||||
#ifdef JBD_ASSERTIONS
|
||||
#define J_ASSERT(assert) \
|
||||
do { \
|
||||
if (!(assert)) { \
|
||||
printk (KERN_EMERG \
|
||||
"Assertion failure in %s() at %s:%d: \"%s\"\n", \
|
||||
__FUNCTION__, __FILE__, __LINE__, # assert); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#if defined(CONFIG_BUFFER_DEBUG)
|
||||
void buffer_assertion_failure(struct buffer_head *bh);
|
||||
#define J_ASSERT_BH(bh, expr) \
|
||||
do { \
|
||||
if (!(expr)) \
|
||||
buffer_assertion_failure(bh); \
|
||||
J_ASSERT(expr); \
|
||||
} while (0)
|
||||
#define J_ASSERT_JH(jh, expr) J_ASSERT_BH(jh2bh(jh), expr)
|
||||
#else
|
||||
#define J_ASSERT_BH(bh, expr) J_ASSERT(expr)
|
||||
#define J_ASSERT_JH(jh, expr) J_ASSERT(expr)
|
||||
#endif
|
||||
|
||||
#else
|
||||
#define J_ASSERT(assert)
|
||||
#endif /* JBD_ASSERTIONS */
|
||||
|
||||
enum jbd_state_bits {
|
||||
BH_JWrite
|
||||
= BH_PrivateStart, /* 1 if being written to log (@@@ DEBUGGING) */
|
||||
BH_Freed, /* 1 if buffer has been freed (truncated) */
|
||||
BH_Revoked, /* 1 if buffer has been revoked from the log */
|
||||
BH_RevokeValid, /* 1 if buffer revoked flag is valid */
|
||||
BH_JBDDirty, /* 1 if buffer is dirty but journaled */
|
||||
};
|
||||
|
||||
/* Return true if the buffer is one which JBD is managing */
|
||||
static inline int buffer_jbd(struct buffer_head *bh)
|
||||
{
|
||||
return __buffer_state(bh, JBD);
|
||||
}
|
||||
|
||||
static inline struct buffer_head *jh2bh(struct journal_head *jh)
|
||||
{
|
||||
return jh->b_bh;
|
||||
}
|
||||
|
||||
static inline struct journal_head *bh2jh(struct buffer_head *bh)
|
||||
{
|
||||
return bh->b_private;
|
||||
}
|
||||
|
||||
struct jbd_revoke_table_s;
|
||||
|
||||
/* The handle_t type represents a single atomic update being performed
|
||||
* by some process. All filesystem modifications made by the process go
|
||||
* through this handle. Recursive operations (such as quota operations)
|
||||
* are gathered into a single update.
|
||||
*
|
||||
* The buffer credits field is used to account for journaled buffers
|
||||
* being modified by the running process. To ensure that there is
|
||||
* enough log space for all outstanding operations, we need to limit the
|
||||
* number of outstanding buffers possible at any time. When the
|
||||
* operation completes, any buffer credits not used are credited back to
|
||||
* the transaction, so that at all times we know how many buffers the
|
||||
* outstanding updates on a transaction might possibly touch. */
|
||||
|
||||
struct handle_s
|
||||
{
|
||||
/* Which compound transaction is this update a part of? */
|
||||
transaction_t * h_transaction;
|
||||
|
||||
/* Number of remaining buffers we are allowed to dirty: */
|
||||
int h_buffer_credits;
|
||||
|
||||
/* Reference count on this handle */
|
||||
int h_ref;
|
||||
|
||||
/* Field for caller's use to track errors through large fs
|
||||
operations */
|
||||
int h_err;
|
||||
|
||||
/* Flags */
|
||||
unsigned int h_sync: 1; /* sync-on-close */
|
||||
unsigned int h_jdata: 1; /* force data journaling */
|
||||
unsigned int h_aborted: 1; /* fatal error on handle */
|
||||
};
|
||||
|
||||
|
||||
/* The transaction_t type is the guts of the journaling mechanism. It
|
||||
* tracks a compound transaction through its various states:
|
||||
*
|
||||
* RUNNING: accepting new updates
|
||||
* LOCKED: Updates still running but we don't accept new ones
|
||||
* RUNDOWN: Updates are tidying up but have finished requesting
|
||||
* new buffers to modify (state not used for now)
|
||||
* FLUSH: All updates complete, but we are still writing to disk
|
||||
* COMMIT: All data on disk, writing commit record
|
||||
* FINISHED: We still have to keep the transaction for checkpointing.
|
||||
*
|
||||
* The transaction keeps track of all of the buffers modified by a
|
||||
* running transaction, and all of the buffers committed but not yet
|
||||
* flushed to home for finished transactions.
|
||||
*/
|
||||
|
||||
struct transaction_s
|
||||
{
|
||||
/* Pointer to the journal for this transaction. */
|
||||
journal_t * t_journal;
|
||||
|
||||
/* Sequence number for this transaction */
|
||||
tid_t t_tid;
|
||||
|
||||
/* Transaction's current state */
|
||||
enum {
|
||||
T_RUNNING,
|
||||
T_LOCKED,
|
||||
T_RUNDOWN,
|
||||
T_FLUSH,
|
||||
T_COMMIT,
|
||||
T_FINISHED
|
||||
} t_state;
|
||||
|
||||
/* Where in the log does this transaction's commit start? */
|
||||
unsigned long t_log_start;
|
||||
|
||||
/* Doubly-linked circular list of all inodes owned by this
|
||||
transaction */ /* AKPM: unused */
|
||||
struct inode * t_ilist;
|
||||
|
||||
/* Number of buffers on the t_buffers list */
|
||||
int t_nr_buffers;
|
||||
|
||||
/* Doubly-linked circular list of all buffers reserved but not
|
||||
yet modified by this transaction */
|
||||
struct journal_head * t_reserved_list;
|
||||
|
||||
/* Doubly-linked circular list of all metadata buffers owned by this
|
||||
transaction */
|
||||
struct journal_head * t_buffers;
|
||||
|
||||
/*
|
||||
* Doubly-linked circular list of all data buffers still to be
|
||||
* flushed before this transaction can be committed.
|
||||
* Protected by journal_datalist_lock.
|
||||
*/
|
||||
struct journal_head * t_sync_datalist;
|
||||
|
||||
/*
|
||||
* Doubly-linked circular list of all writepage data buffers
|
||||
* still to be written before this transaction can be committed.
|
||||
* Protected by journal_datalist_lock.
|
||||
*/
|
||||
struct journal_head * t_async_datalist;
|
||||
|
||||
/* Doubly-linked circular list of all forget buffers (superceded
|
||||
buffers which we can un-checkpoint once this transaction
|
||||
commits) */
|
||||
struct journal_head * t_forget;
|
||||
|
||||
/*
|
||||
* Doubly-linked circular list of all buffers still to be
|
||||
* flushed before this transaction can be checkpointed.
|
||||
*/
|
||||
/* Protected by journal_datalist_lock */
|
||||
struct journal_head * t_checkpoint_list;
|
||||
|
||||
/* Doubly-linked circular list of temporary buffers currently
|
||||
undergoing IO in the log */
|
||||
struct journal_head * t_iobuf_list;
|
||||
|
||||
/* Doubly-linked circular list of metadata buffers being
|
||||
shadowed by log IO. The IO buffers on the iobuf list and the
|
||||
shadow buffers on this list match each other one for one at
|
||||
all times. */
|
||||
struct journal_head * t_shadow_list;
|
||||
|
||||
/* Doubly-linked circular list of control buffers being written
|
||||
to the log. */
|
||||
struct journal_head * t_log_list;
|
||||
|
||||
/* Number of outstanding updates running on this transaction */
|
||||
int t_updates;
|
||||
|
||||
/* Number of buffers reserved for use by all handles in this
|
||||
* transaction handle but not yet modified. */
|
||||
int t_outstanding_credits;
|
||||
|
||||
/*
|
||||
* Forward and backward links for the circular list of all
|
||||
* transactions awaiting checkpoint.
|
||||
*/
|
||||
/* Protected by journal_datalist_lock */
|
||||
transaction_t *t_cpnext, *t_cpprev;
|
||||
|
||||
/* When will the transaction expire (become due for commit), in
|
||||
* jiffies ? */
|
||||
unsigned long t_expires;
|
||||
|
||||
/* How many handles used this transaction? */
|
||||
int t_handle_count;
|
||||
};
|
||||
|
||||
|
||||
/* The journal_t maintains all of the journaling state information for a
|
||||
* single filesystem. It is linked to from the fs superblock structure.
|
||||
*
|
||||
* We use the journal_t to keep track of all outstanding transaction
|
||||
* activity on the filesystem, and to manage the state of the log
|
||||
* writing process. */
|
||||
|
||||
struct journal_s
|
||||
{
|
||||
/* General journaling state flags */
|
||||
unsigned long j_flags;
|
||||
|
||||
/* Is there an outstanding uncleared error on the journal (from
|
||||
* a prior abort)? */
|
||||
int j_errno;
|
||||
|
||||
/* The superblock buffer */
|
||||
struct buffer_head * j_sb_buffer;
|
||||
journal_superblock_t * j_superblock;
|
||||
|
||||
/* Version of the superblock format */
|
||||
int j_format_version;
|
||||
|
||||
/* Number of processes waiting to create a barrier lock */
|
||||
int j_barrier_count;
|
||||
|
||||
/* The barrier lock itself */
|
||||
struct semaphore j_barrier;
|
||||
|
||||
/* Transactions: The current running transaction... */
|
||||
transaction_t * j_running_transaction;
|
||||
|
||||
/* ... the transaction we are pushing to disk ... */
|
||||
transaction_t * j_committing_transaction;
|
||||
|
||||
/* ... and a linked circular list of all transactions waiting
|
||||
* for checkpointing. */
|
||||
/* Protected by journal_datalist_lock */
|
||||
transaction_t * j_checkpoint_transactions;
|
||||
|
||||
/* Wait queue for waiting for a locked transaction to start
|
||||
committing, or for a barrier lock to be released */
|
||||
wait_queue_head_t j_wait_transaction_locked;
|
||||
|
||||
/* Wait queue for waiting for checkpointing to complete */
|
||||
wait_queue_head_t j_wait_logspace;
|
||||
|
||||
/* Wait queue for waiting for commit to complete */
|
||||
wait_queue_head_t j_wait_done_commit;
|
||||
|
||||
/* Wait queue to trigger checkpointing */
|
||||
wait_queue_head_t j_wait_checkpoint;
|
||||
|
||||
/* Wait queue to trigger commit */
|
||||
wait_queue_head_t j_wait_commit;
|
||||
|
||||
/* Wait queue to wait for updates to complete */
|
||||
wait_queue_head_t j_wait_updates;
|
||||
|
||||
/* Semaphore for locking against concurrent checkpoints */
|
||||
struct semaphore j_checkpoint_sem;
|
||||
|
||||
/* The main journal lock, used by lock_journal() */
|
||||
struct semaphore j_sem;
|
||||
|
||||
/* Journal head: identifies the first unused block in the journal. */
|
||||
unsigned long j_head;
|
||||
|
||||
/* Journal tail: identifies the oldest still-used block in the
|
||||
* journal. */
|
||||
unsigned long j_tail;
|
||||
|
||||
/* Journal free: how many free blocks are there in the journal? */
|
||||
unsigned long j_free;
|
||||
|
||||
/* Journal start and end: the block numbers of the first usable
|
||||
* block and one beyond the last usable block in the journal. */
|
||||
unsigned long j_first, j_last;
|
||||
|
||||
/* Device, blocksize and starting block offset for the location
|
||||
* where we store the journal. */
|
||||
kdev_t j_dev;
|
||||
int j_blocksize;
|
||||
unsigned int j_blk_offset;
|
||||
|
||||
/* Device which holds the client fs. For internal journal this
|
||||
* will be equal to j_dev. */
|
||||
kdev_t j_fs_dev;
|
||||
|
||||
/* Total maximum capacity of the journal region on disk. */
|
||||
unsigned int j_maxlen;
|
||||
|
||||
/* Optional inode where we store the journal. If present, all
|
||||
* journal block numbers are mapped into this inode via
|
||||
* bmap(). */
|
||||
struct inode * j_inode;
|
||||
|
||||
/* Sequence number of the oldest transaction in the log */
|
||||
tid_t j_tail_sequence;
|
||||
/* Sequence number of the next transaction to grant */
|
||||
tid_t j_transaction_sequence;
|
||||
/* Sequence number of the most recently committed transaction */
|
||||
tid_t j_commit_sequence;
|
||||
/* Sequence number of the most recent transaction wanting commit */
|
||||
tid_t j_commit_request;
|
||||
|
||||
/* Journal uuid: identifies the object (filesystem, LVM volume
|
||||
* etc) backed by this journal. This will eventually be
|
||||
* replaced by an array of uuids, allowing us to index multiple
|
||||
* devices within a single journal and to perform atomic updates
|
||||
* across them. */
|
||||
|
||||
__u8 j_uuid[16];
|
||||
|
||||
/* Pointer to the current commit thread for this journal */
|
||||
struct task_struct * j_task;
|
||||
|
||||
/* Maximum number of metadata buffers to allow in a single
|
||||
* compound commit transaction */
|
||||
int j_max_transaction_buffers;
|
||||
|
||||
/* What is the maximum transaction lifetime before we begin a
|
||||
* commit? */
|
||||
unsigned long j_commit_interval;
|
||||
|
||||
/* The timer used to wakeup the commit thread: */
|
||||
struct timer_list * j_commit_timer;
|
||||
int j_commit_timer_active;
|
||||
|
||||
/* Link all journals together - system-wide */
|
||||
struct list_head j_all_journals;
|
||||
|
||||
/* The revoke table: maintains the list of revoked blocks in the
|
||||
current transaction. */
|
||||
struct jbd_revoke_table_s *j_revoke;
|
||||
};
|
||||
|
||||
/*
|
||||
* Journal flag definitions
|
||||
*/
|
||||
#define JFS_UNMOUNT 0x001 /* Journal thread is being destroyed */
|
||||
#define JFS_ABORT 0x002 /* Journaling has been aborted for errors. */
|
||||
#define JFS_ACK_ERR 0x004 /* The errno in the sb has been acked */
|
||||
#define JFS_FLUSHED 0x008 /* The journal superblock has been flushed */
|
||||
#define JFS_LOADED 0x010 /* The journal superblock has been loaded */
|
||||
|
||||
/*
|
||||
* Function declarations for the journaling transaction and buffer
|
||||
* management
|
||||
*/
|
||||
|
||||
/* Filing buffers */
|
||||
extern void __journal_unfile_buffer(struct journal_head *);
|
||||
extern void journal_unfile_buffer(struct journal_head *);
|
||||
extern void __journal_refile_buffer(struct journal_head *);
|
||||
extern void journal_refile_buffer(struct journal_head *);
|
||||
extern void __journal_file_buffer(struct journal_head *, transaction_t *, int);
|
||||
extern void __journal_free_buffer(struct journal_head *bh);
|
||||
extern void journal_file_buffer(struct journal_head *, transaction_t *, int);
|
||||
extern void __journal_clean_data_list(transaction_t *transaction);
|
||||
|
||||
/* Log buffer allocation */
|
||||
extern struct journal_head * journal_get_descriptor_buffer(journal_t *);
|
||||
extern unsigned long journal_next_log_block(journal_t *);
|
||||
|
||||
/* Commit management */
|
||||
extern void journal_commit_transaction(journal_t *);
|
||||
|
||||
/* Checkpoint list management */
|
||||
int __journal_clean_checkpoint_list(journal_t *journal);
|
||||
extern void journal_remove_checkpoint(struct journal_head *);
|
||||
extern void __journal_remove_checkpoint(struct journal_head *);
|
||||
extern void journal_insert_checkpoint(struct journal_head *, transaction_t *);
|
||||
extern void __journal_insert_checkpoint(struct journal_head *,transaction_t *);
|
||||
|
||||
/* Buffer IO */
|
||||
extern int
|
||||
journal_write_metadata_buffer(transaction_t *transaction,
|
||||
struct journal_head *jh_in,
|
||||
struct journal_head **jh_out,
|
||||
int blocknr);
|
||||
|
||||
/* Transaction locking */
|
||||
extern void __wait_on_journal (journal_t *);
|
||||
|
||||
/*
|
||||
* Journal locking.
|
||||
*
|
||||
* We need to lock the journal during transaction state changes so that
|
||||
* nobody ever tries to take a handle on the running transaction while
|
||||
* we are in the middle of moving it to the commit phase.
|
||||
*
|
||||
* Note that the locking is completely interrupt unsafe. We never touch
|
||||
* journal structures from interrupts.
|
||||
*
|
||||
* In 2.2, the BKL was required for lock_journal. This is no longer
|
||||
* the case.
|
||||
*/
|
||||
|
||||
static inline void lock_journal(journal_t *journal)
|
||||
{
|
||||
down(&journal->j_sem);
|
||||
}
|
||||
|
||||
/* This returns zero if we acquired the semaphore */
|
||||
static inline int try_lock_journal(journal_t * journal)
|
||||
{
|
||||
return down_trylock(&journal->j_sem);
|
||||
}
|
||||
|
||||
static inline void unlock_journal(journal_t * journal)
|
||||
{
|
||||
up(&journal->j_sem);
|
||||
}
|
||||
|
||||
|
||||
static inline handle_t *journal_current_handle(void)
|
||||
{
|
||||
return current->journal_info;
|
||||
}
|
||||
|
||||
/* The journaling code user interface:
|
||||
*
|
||||
* Create and destroy handles
|
||||
* Register buffer modifications against the current transaction.
|
||||
*/
|
||||
|
||||
extern handle_t *journal_start(journal_t *, int nblocks);
|
||||
extern handle_t *journal_try_start(journal_t *, int nblocks);
|
||||
extern int journal_restart (handle_t *, int nblocks);
|
||||
extern int journal_extend (handle_t *, int nblocks);
|
||||
extern int journal_get_write_access (handle_t *, struct buffer_head *);
|
||||
extern int journal_get_create_access (handle_t *, struct buffer_head *);
|
||||
extern int journal_get_undo_access (handle_t *, struct buffer_head *);
|
||||
extern int journal_dirty_data (handle_t *,
|
||||
struct buffer_head *, int async);
|
||||
extern int journal_dirty_metadata (handle_t *, struct buffer_head *);
|
||||
extern void journal_release_buffer (handle_t *, struct buffer_head *);
|
||||
extern void journal_forget (handle_t *, struct buffer_head *);
|
||||
extern void journal_sync_buffer (struct buffer_head *);
|
||||
extern int journal_flushpage(journal_t *, struct page *, unsigned long);
|
||||
extern int journal_try_to_free_buffers(journal_t *, struct page *, int);
|
||||
extern int journal_stop(handle_t *);
|
||||
extern int journal_flush (journal_t *);
|
||||
|
||||
extern void journal_lock_updates (journal_t *);
|
||||
extern void journal_unlock_updates (journal_t *);
|
||||
|
||||
extern journal_t * journal_init_dev(kdev_t dev, kdev_t fs_dev,
|
||||
int start, int len, int bsize);
|
||||
extern journal_t * journal_init_inode (struct inode *);
|
||||
extern int journal_update_format (journal_t *);
|
||||
extern int journal_check_used_features
|
||||
(journal_t *, unsigned long, unsigned long, unsigned long);
|
||||
extern int journal_check_available_features
|
||||
(journal_t *, unsigned long, unsigned long, unsigned long);
|
||||
extern int journal_set_features
|
||||
(journal_t *, unsigned long, unsigned long, unsigned long);
|
||||
extern int journal_create (journal_t *);
|
||||
extern int journal_load (journal_t *journal);
|
||||
extern void journal_destroy (journal_t *);
|
||||
extern int journal_recover (journal_t *journal);
|
||||
extern int journal_wipe (journal_t *, int);
|
||||
extern int journal_skip_recovery (journal_t *);
|
||||
extern void journal_update_superblock (journal_t *, int);
|
||||
extern void __journal_abort (journal_t *);
|
||||
extern void journal_abort (journal_t *, int);
|
||||
extern int journal_errno (journal_t *);
|
||||
extern void journal_ack_err (journal_t *);
|
||||
extern int journal_clear_err (journal_t *);
|
||||
extern unsigned long journal_bmap(journal_t *journal, unsigned long blocknr);
|
||||
extern int journal_force_commit(journal_t *journal);
|
||||
|
||||
/*
|
||||
* journal_head management
|
||||
*/
|
||||
extern struct journal_head
|
||||
*journal_add_journal_head(struct buffer_head *bh);
|
||||
extern void journal_remove_journal_head(struct buffer_head *bh);
|
||||
extern void __journal_remove_journal_head(struct buffer_head *bh);
|
||||
extern void journal_unlock_journal_head(struct journal_head *jh);
|
||||
|
||||
/* Primary revoke support */
|
||||
#define JOURNAL_REVOKE_DEFAULT_HASH 256
|
||||
extern int journal_init_revoke(journal_t *, int);
|
||||
extern void journal_destroy_revoke_caches(void);
|
||||
extern int journal_init_revoke_caches(void);
|
||||
|
||||
extern void journal_destroy_revoke(journal_t *);
|
||||
extern int journal_revoke (handle_t *,
|
||||
unsigned long, struct buffer_head *);
|
||||
extern int journal_cancel_revoke(handle_t *, struct journal_head *);
|
||||
extern void journal_write_revoke_records(journal_t *, transaction_t *);
|
||||
|
||||
/* Recovery revoke support */
|
||||
extern int journal_set_revoke(journal_t *, unsigned long, tid_t);
|
||||
extern int journal_test_revoke(journal_t *, unsigned long, tid_t);
|
||||
extern void journal_clear_revoke(journal_t *);
|
||||
extern void journal_brelse_array(struct buffer_head *b[], int n);
|
||||
|
||||
/* The log thread user interface:
|
||||
*
|
||||
* Request space in the current transaction, and force transaction commit
|
||||
* transitions on demand.
|
||||
*/
|
||||
|
||||
extern int log_space_left (journal_t *); /* Called with journal locked */
|
||||
extern tid_t log_start_commit (journal_t *, transaction_t *);
|
||||
extern void log_wait_commit (journal_t *, tid_t);
|
||||
extern int log_do_checkpoint (journal_t *, int);
|
||||
|
||||
extern void log_wait_for_space(journal_t *, int nblocks);
|
||||
extern void __journal_drop_transaction(journal_t *, transaction_t *);
|
||||
extern int cleanup_journal_tail(journal_t *);
|
||||
|
||||
/* Reduce journal memory usage by flushing */
|
||||
extern void shrink_journal_memory(void);
|
||||
|
||||
/* Debugging code only: */
|
||||
|
||||
#define jbd_ENOSYS() \
|
||||
do { \
|
||||
printk (KERN_ERR "JBD unimplemented function " __FUNCTION__); \
|
||||
current->state = TASK_UNINTERRUPTIBLE; \
|
||||
schedule(); \
|
||||
} while (1)
|
||||
|
||||
/*
|
||||
* is_journal_abort
|
||||
*
|
||||
* Simple test wrapper function to test the JFS_ABORT state flag. This
|
||||
* bit, when set, indicates that we have had a fatal error somewhere,
|
||||
* either inside the journaling layer or indicated to us by the client
|
||||
* (eg. ext3), and that we and should not commit any further
|
||||
* transactions.
|
||||
*/
|
||||
|
||||
static inline int is_journal_aborted(journal_t *journal)
|
||||
{
|
||||
return journal->j_flags & JFS_ABORT;
|
||||
}
|
||||
|
||||
static inline int is_handle_aborted(handle_t *handle)
|
||||
{
|
||||
if (handle->h_aborted)
|
||||
return 1;
|
||||
return is_journal_aborted(handle->h_transaction->t_journal);
|
||||
}
|
||||
|
||||
static inline void journal_abort_handle(handle_t *handle)
|
||||
{
|
||||
handle->h_aborted = 1;
|
||||
}
|
||||
|
||||
/* Not all architectures define BUG() */
|
||||
#ifndef BUG
|
||||
#define BUG() do { \
|
||||
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
|
||||
* ((char *) 0) = 0; \
|
||||
} while (0)
|
||||
#endif /* BUG */
|
||||
|
||||
#else
|
||||
|
||||
extern int journal_recover (journal_t *journal);
|
||||
extern int journal_skip_recovery (journal_t *);
|
||||
|
||||
/* Primary revoke support */
|
||||
extern int journal_init_revoke(journal_t *, int);
|
||||
extern void journal_destroy_revoke_caches(void);
|
||||
extern int journal_init_revoke_caches(void);
|
||||
|
||||
/* Recovery revoke support */
|
||||
extern int journal_set_revoke(journal_t *, unsigned long, tid_t);
|
||||
extern int journal_test_revoke(journal_t *, unsigned long, tid_t);
|
||||
extern void journal_clear_revoke(journal_t *);
|
||||
extern void journal_brelse_array(struct buffer_head *b[], int n);
|
||||
|
||||
extern void journal_destroy_revoke(journal_t *);
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
/* Comparison functions for transaction IDs: perform comparisons using
|
||||
* modulo arithmetic so that they work over sequence number wraps. */
|
||||
|
||||
static inline int tid_gt(tid_t x, tid_t y)
|
||||
{
|
||||
int difference = (x - y);
|
||||
return (difference > 0);
|
||||
}
|
||||
|
||||
static inline int tid_geq(tid_t x, tid_t y)
|
||||
{
|
||||
int difference = (x - y);
|
||||
return (difference >= 0);
|
||||
}
|
||||
|
||||
extern int journal_blocks_per_page(struct inode *inode);
|
||||
|
||||
/*
|
||||
* Definitions which augment the buffer_head layer
|
||||
@ -827,84 +181,55 @@ extern int journal_blocks_per_page(struct inode *inode);
|
||||
#define BJ_Reserved 8 /* Buffer is reserved for access by journal */
|
||||
#define BJ_Types 9
|
||||
|
||||
extern int jbd_blocks_per_page(struct inode *inode);
|
||||
|
||||
#ifdef __KERNEL__
|
||||
struct kdev_s {
|
||||
e2fsck_t k_ctx;
|
||||
int k_dev;
|
||||
};
|
||||
|
||||
extern spinlock_t jh_splice_lock;
|
||||
/*
|
||||
* Once `expr1' has been found true, take jh_splice_lock
|
||||
* and then reevaluate everything.
|
||||
*/
|
||||
#define SPLICE_LOCK(expr1, expr2) \
|
||||
({ \
|
||||
int ret = (expr1); \
|
||||
if (ret) { \
|
||||
spin_lock(&jh_splice_lock); \
|
||||
ret = (expr1) && (expr2); \
|
||||
spin_unlock(&jh_splice_lock); \
|
||||
} \
|
||||
ret; \
|
||||
})
|
||||
typedef struct kdev_s *kdev_t;
|
||||
typedef unsigned int tid_t;
|
||||
|
||||
/*
|
||||
* A number of buffer state predicates. They test for
|
||||
* buffer_jbd() because they are used in core kernel code.
|
||||
*
|
||||
* These will be racy on SMP unless we're *sure* that the
|
||||
* buffer won't be detached from the journalling system
|
||||
* in parallel.
|
||||
*/
|
||||
|
||||
/* Return true if the buffer is on journal list `list' */
|
||||
static inline int buffer_jlist_eq(struct buffer_head *bh, int list)
|
||||
struct journal_s
|
||||
{
|
||||
return SPLICE_LOCK(buffer_jbd(bh), bh2jh(bh)->b_jlist == list);
|
||||
}
|
||||
unsigned long j_flags;
|
||||
int j_errno;
|
||||
struct buffer_head * j_sb_buffer;
|
||||
struct journal_superblock_s *j_superblock;
|
||||
int j_format_version;
|
||||
unsigned long j_head;
|
||||
unsigned long j_tail;
|
||||
unsigned long j_free;
|
||||
unsigned long j_first, j_last;
|
||||
kdev_t j_dev;
|
||||
kdev_t j_fs_dev;
|
||||
int j_blocksize;
|
||||
unsigned int j_blk_offset;
|
||||
unsigned int j_maxlen;
|
||||
struct inode * j_inode;
|
||||
tid_t j_tail_sequence;
|
||||
tid_t j_transaction_sequence;
|
||||
__u8 j_uuid[16];
|
||||
struct jbd_revoke_table_s *j_revoke;
|
||||
};
|
||||
|
||||
/* Return true if this bufer is dirty wrt the journal */
|
||||
static inline int buffer_jdirty(struct buffer_head *bh)
|
||||
{
|
||||
return buffer_jbd(bh) && __buffer_state(bh, JBDDirty);
|
||||
}
|
||||
typedef struct journal_s journal_t;
|
||||
|
||||
/* Return true if it's a data buffer which journalling is managing */
|
||||
static inline int buffer_jbd_data(struct buffer_head *bh)
|
||||
{
|
||||
return SPLICE_LOCK(buffer_jbd(bh),
|
||||
bh2jh(bh)->b_jlist == BJ_SyncData ||
|
||||
bh2jh(bh)->b_jlist == BJ_AsyncData);
|
||||
}
|
||||
extern int journal_recover (journal_t *journal);
|
||||
extern int journal_skip_recovery (journal_t *);
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
#define assert_spin_locked(lock) J_ASSERT(spin_is_locked(lock))
|
||||
#else
|
||||
#define assert_spin_locked(lock) do {} while(0)
|
||||
#endif
|
||||
/* Primary revoke support */
|
||||
extern int journal_init_revoke(journal_t *, int);
|
||||
extern void journal_destroy_revoke_caches(void);
|
||||
extern int journal_init_revoke_caches(void);
|
||||
|
||||
#define buffer_trace_init(bh) do {} while (0)
|
||||
#define print_buffer_fields(bh) do {} while (0)
|
||||
#define print_buffer_trace(bh) do {} while (0)
|
||||
#define BUFFER_TRACE(bh, info) do {} while (0)
|
||||
#define BUFFER_TRACE2(bh, bh2, info) do {} while (0)
|
||||
#define JBUFFER_TRACE(jh, info) do {} while (0)
|
||||
/* Recovery revoke support */
|
||||
extern int journal_set_revoke(journal_t *, unsigned long, tid_t);
|
||||
extern int journal_test_revoke(journal_t *, unsigned long, tid_t);
|
||||
extern void journal_clear_revoke(journal_t *);
|
||||
extern void journal_brelse_array(struct buffer_head *b[], int n);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
extern void journal_destroy_revoke(journal_t *);
|
||||
|
||||
#endif /* CONFIG_JBD || CONFIG_JBD_MODULE || !__KERNEL__ */
|
||||
|
||||
/*
|
||||
* Compatibility no-ops which allow the kernel to compile without CONFIG_JBD
|
||||
* go here.
|
||||
*/
|
||||
|
||||
#if defined(__KERNEL__) && !(defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE))
|
||||
|
||||
#define J_ASSERT(expr) do {} while (0)
|
||||
#define J_ASSERT_BH(bh, expr) do {} while (0)
|
||||
#define buffer_jbd(bh) 0
|
||||
#define buffer_jlist_eq(bh, val) 0
|
||||
#define journal_buffer_journal_lru(bh) 0
|
||||
|
||||
#endif /* defined(__KERNEL__) && !defined(CONFIG_JBD) */
|
||||
#endif /* _LINUX_JBD_H */
|
||||
|
||||
@ -34,8 +34,9 @@
|
||||
|
||||
#include "ext2_fs.h"
|
||||
#include "../e2p/e2p.h"
|
||||
#include "../e2fsck.h"
|
||||
#include "ext2fs.h"
|
||||
#include "jfs_user.h"
|
||||
#include "kernel-jbd.h"
|
||||
|
||||
/*
|
||||
* This function automatically sets up the journal superblock and
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
#include "ext2fs/ext2fs.h"
|
||||
#include "uuid/uuid.h"
|
||||
#include "e2p/e2p.h"
|
||||
#include "ext2fs/jfs_user.h"
|
||||
#include "ext2fs/kernel-jbd.h"
|
||||
#include "util.h"
|
||||
#include "blkid/blkid.h"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user