X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fjfs_user.h;h=239ac1ddeb2c14769d6912378dbe396c886c224d;hb=1942e33c812a030ba0a0a9bff2e8527159d44749;hp=bfc1bcdee518973887fa17804518693d6c4a990e;hpb=ab3f5c5aad6310be1d1891c05f1bc8cf7ccf0cef;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index bfc1bcd..239ac1d 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -8,62 +8,92 @@ * GNU General Public License version 2 or at your discretion * any later version. */ +#ifndef _JFS_USER_H +#define _JFS_USER_H +#ifdef DEBUGFS +#include +#include +#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 +#else /* * Pull in the definition of the e2fsck context structure */ +#include "config.h" #include "e2fsck.h" +#endif + +#if __STDC_VERSION__ < 199901L +# if __GNUC__ >= 2 || _MSC_VER >= 1300 +# define __func__ __FUNCTION__ +# else +# define __func__ "" +# endif +#endif struct buffer_head { +#ifdef DEBUGFS + ext2_filsys b_fs; +#else e2fsck_t b_ctx; - io_channel b_io; - int b_size; +#endif + io_channel b_io; + int b_size; + int b_err; + unsigned int b_dirty:1; + unsigned int b_uptodate:1; unsigned long long b_blocknr; - int b_dirty; - int b_uptodate; - int b_err; char b_data[1024]; }; struct inode { +#ifdef DEBUGFS + ext2_filsys i_fs; +#else e2fsck_t i_ctx; +#endif ext2_ino_t i_ino; struct ext2_inode i_ext2; }; struct kdev_s { +#ifdef DEBUGFS + ext2_filsys k_fs; +#else e2fsck_t k_ctx; +#endif 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 lock_buffer(bh) do {} while (0) +#define unlock_buffer(bh) do {} while (0) #define buffer_req(bh) 1 -#define do_readahead(journal, start) do {} while(0) - -extern e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ +#define do_readahead(journal, start) do {} while (0) typedef struct { int object_length; } lkmem_cache_t; -#define kmem_cache_alloc(cache,flags) malloc((cache)->object_length) -#define kmem_cache_free(cache,obj) free(obj) -#define kmem_cache_create(name,len,a,b,c,d) do_cache_create(len) +#define kmem_cache_alloc(cache, flags) malloc((cache)->object_length) +#define kmem_cache_free(cache, obj) free(obj) +#define kmem_cache_create(name, len, a, b, c) do_cache_create(len) #define kmem_cache_destroy(cache) do_cache_destroy(cache) -#define kmalloc(len,flags) malloc(len) +#define kmalloc(len, flags) malloc(len) #define kfree(p) free(p) #define cond_resched() do { } while (0) -typedef unsigned int __be32; -typedef __u64 __be64; - #define __init /* @@ -76,9 +106,12 @@ typedef __u64 __be64; * functions. */ #ifdef NO_INLINE_FUNCS -extern lkmem_cache_t * do_cache_create(int len); +extern lkmem_cache_t *do_cache_create(int len); extern void do_cache_destroy(lkmem_cache_t *cache); extern size_t journal_tag_bytes(journal_t *journal); +extern __u32 __hash_32(__u32 val); +extern __u32 hash_32(__u32 val, unsigned int bits); +extern __u32 hash_64(__u64 val, unsigned int bits); #endif #if (defined(E2FSCK_INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS)) @@ -100,10 +133,10 @@ extern size_t journal_tag_bytes(journal_t *journal); #endif /* __STDC_VERSION__ >= 199901L */ #endif /* E2FSCK_INCLUDE_INLINE_FUNCS */ - -_INLINE_ lkmem_cache_t * do_cache_create(int len) +_INLINE_ lkmem_cache_t *do_cache_create(int len) { lkmem_cache_t *new_cache; + new_cache = malloc(sizeof(*new_cache)); if (new_cache) new_cache->object_length = len; @@ -115,15 +148,30 @@ _INLINE_ void do_cache_destroy(lkmem_cache_t *cache) free(cache); } -/* - * helper functions to deal with 32 or 64bit block numbers. - */ -_INLINE_ size_t journal_tag_bytes(journal_t *journal) +/* generic hashing taken from the Linux kernel */ +#define GOLDEN_RATIO_32 0x61C88647 +#define GOLDEN_RATIO_64 0x61C8864680B583EBull + +_INLINE_ __u32 __hash_32(__u32 val) { - if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_64BIT)) - return JBD_TAG_SIZE64; - else - return JBD_TAG_SIZE32; + return val * GOLDEN_RATIO_32; +} + +_INLINE_ __u32 hash_32(__u32 val, unsigned int bits) +{ + /* High bits are more random, so use them. */ + return __hash_32(val) >> (32 - bits); +} + +_INLINE_ __u32 hash_64(__u64 val, unsigned int bits) +{ + if (sizeof(long) >= 8) { + /* 64x64-bit multiply is efficient on all 64-bit processors */ + return val * GOLDEN_RATIO_64 >> (64 - bits); + } else { + /* Hash 64 bits using only 32x32-bit multiply. */ + return hash_32((__u32)val ^ __hash_32(val >> 32), bits); + } } #undef _INLINE_ @@ -132,10 +180,11 @@ _INLINE_ size_t journal_tag_bytes(journal_t *journal) /* * Kernel compatibility functions are defined in journal.c */ -int journal_bmap(journal_t *journal, blk64_t block, unsigned long long *phys); +int jbd2_journal_bmap(journal_t *journal, blk64_t block, + unsigned long long *phys); struct buffer_head *getblk(kdev_t ctx, blk64_t blocknr, int blocksize); -void sync_blockdev(kdev_t kdev); -void ll_rw_block(int rw, int dummy, struct buffer_head *bh[]); +int sync_blockdev(kdev_t kdev); +void ll_rw_block(int rw, int op_flags, int nr, struct buffer_head *bh[]); void mark_buffer_dirty(struct buffer_head *bh); void mark_buffer_uptodate(struct buffer_head *bh, int val); void brelse(struct buffer_head *bh); @@ -147,3 +196,64 @@ void wait_on_buffer(struct buffer_head *bh); */ #define __getblk(dev, blocknr, blocksize) getblk(dev, blocknr, blocksize) #define set_buffer_uptodate(bh) mark_buffer_uptodate(bh, 1) + +#ifdef DEBUGFS +#include +#undef J_ASSERT +#define J_ASSERT(x) assert(x) + +#define JSB_HAS_INCOMPAT_FEATURE(jsb, mask) \ + ((jsb)->s_header.h_blocktype == ext2fs_cpu_to_be32(JBD2_SUPERBLOCK_V2) && \ + ((jsb)->s_feature_incompat & ext2fs_cpu_to_be32((mask)))) +#else /* !DEBUGFS */ + +extern e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ + +#define J_ASSERT(assert) \ + do { if (!(assert)) { \ + printf ("Assertion failure in %s() at %s line %d: " \ + "\"%s\"\n", \ + __func__, __FILE__, __LINE__, # assert); \ + fatal_error(e2fsck_global_ctx, 0); \ + } } while (0) + +#endif /* DEBUGFS */ + +#ifndef EFSBADCRC +#define EFSBADCRC EXT2_ET_BAD_CRC +#endif +#ifndef EFSCORRUPTED +#define EFSCORRUPTED EXT2_ET_FILESYSTEM_CORRUPTED +#endif + +static inline void jbd2_descriptor_block_csum_set(journal_t *j, + struct buffer_head *bh) +{ + struct jbd2_journal_block_tail *tail; + __u32 csum; + + if (!jbd2_journal_has_csum_v2or3(j)) + return; + + tail = (struct jbd2_journal_block_tail *)(bh->b_data + j->j_blocksize - + sizeof(struct jbd2_journal_block_tail)); + tail->t_checksum = 0; + csum = jbd2_chksum(j, j->j_csum_seed, bh->b_data, j->j_blocksize); + tail->t_checksum = cpu_to_be32(csum); +} + +/* recovery.c */ +extern int jbd2_journal_recover (journal_t *journal); +extern int jbd2_journal_skip_recovery (journal_t *); + +/* revoke.c */ +extern int jbd2_journal_init_revoke(journal_t *, int); +extern void jbd2_journal_destroy_revoke(journal_t *); +extern void jbd2_journal_destroy_revoke_caches(void); +extern int jbd2_journal_init_revoke_caches(void); + +extern int jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t); +extern int jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t); +extern void jbd2_journal_clear_revoke(journal_t *); + +#endif /* _JFS_USER_H */