X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fjfs_user.h;h=1167c80d3df917351b0cf6e0eeadb124ea9b3820;hb=013e5d86db02957d840d9fd331a677218dc693df;hp=adb8ae937623f295d71ca97e56ea0ae525e7cefe;hpb=759c46cf45a8f8a1938404604bf666479e9b9831;p=tools%2Fe2fsprogs.git diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index adb8ae9..1167c80 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -11,7 +11,11 @@ #ifndef _JFS_USER_H #define _JFS_USER_H +#include "config.h" + #ifdef DEBUGFS +#include +#include #if EXT2_FLAT_INCLUDES #include "ext2_fs.h" #include "ext2fs.h" @@ -28,6 +32,14 @@ #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; @@ -36,11 +48,11 @@ struct buffer_head { #endif io_channel b_io; int b_size; - unsigned long long b_blocknr; - int b_dirty; - int b_uptodate; int b_err; - char b_data[1024]; + unsigned int b_dirty:1; + unsigned int b_uptodate:1; + unsigned long long b_blocknr; + char b_data[4096]; }; struct inode { @@ -65,29 +77,17 @@ struct kdev_s { #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 #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) do_cache_create(len) -#define kmem_cache_destroy(cache) do_cache_destroy(cache) -#define kmalloc(len, flags) malloc(len) -#define kfree(p) free(p) +struct kmem_cache { + unsigned int object_size; +}; #define cond_resched() do { } while (0) -typedef unsigned int __be32; -typedef __u64 __be64; - #define __init /* @@ -100,9 +100,25 @@ typedef __u64 __be64; * functions. */ #ifdef NO_INLINE_FUNCS -extern lkmem_cache_t *do_cache_create(int len); -extern void do_cache_destroy(lkmem_cache_t *cache); +extern struct kmem_cache *kmem_cache_create(const char *name, + unsigned int size, + unsigned int align, + unsigned int flags, + void (*ctor)(void *)); +extern void kmem_cache_destroy(struct kmem_cache *s); +extern void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags); +extern void kmem_cache_free(struct kmem_cache *s, void *objp); +extern void *kmalloc(size_t size, gfp_t flags); +extern void kfree(const void *objp); 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); +extern void *kmalloc_array(unsigned n, unsigned size, int flags); +extern __u32 jbd2_chksum(journal_t *j, __u32 crc, const void *address, + unsigned int length); +extern void jbd2_descriptor_block_csum_set(journal_t *j, + struct buffer_head *bh); #endif #if (defined(E2FSCK_INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS)) @@ -124,32 +140,116 @@ 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_ struct kmem_cache * +kmem_cache_create(const char *name EXT2FS_ATTR((unused)), + unsigned int size, + unsigned int align EXT2FS_ATTR((unused)), + unsigned int flags EXT2FS_ATTR((unused)), + void (*ctor)(void *) EXT2FS_ATTR((unused))) { - lkmem_cache_t *new_cache; + struct kmem_cache *new_cache; new_cache = malloc(sizeof(*new_cache)); if (new_cache) - new_cache->object_length = len; + new_cache->object_size = size; return new_cache; } -_INLINE_ void do_cache_destroy(lkmem_cache_t *cache) +_INLINE_ void kmem_cache_destroy(struct kmem_cache *s) +{ + free(s); +} + +_INLINE_ void *kmem_cache_alloc(struct kmem_cache *cachep, + gfp_t flags EXT2FS_ATTR((unused))) +{ + return malloc(cachep->object_size); +} + +_INLINE_ void kmem_cache_free(struct kmem_cache *s EXT2FS_ATTR((unused)), + void *objp) +{ + free(objp); +} + +_INLINE_ void *kmalloc(size_t size, gfp_t flags EXT2FS_ATTR((unused))) +{ + return malloc(size); +} + +_INLINE_ void kfree(const void *objp) +{ + free((void *)objp); +} + +/* generic hashing taken from the Linux kernel */ +#define GOLDEN_RATIO_32 0x61C88647 +#define GOLDEN_RATIO_64 0x61C8864680B583EBull + +_INLINE_ __u32 __hash_32(__u32 val) +{ + 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); + } +} + +_INLINE_ void *kmalloc_array(unsigned n, unsigned size, + int flags EXT2FS_ATTR((unused))) { - free(cache); + if (n && (~0U)/n < size) + return NULL; + return malloc(n * size); } +_INLINE_ __u32 jbd2_chksum(journal_t *j EXT2FS_ATTR((unused)), + __u32 crc, const void *address, + unsigned int length) +{ + return ext2fs_crc32c_le(crc, address, length); +} + +_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); +} #undef _INLINE_ #endif /* * Kernel compatibility functions are defined in journal.c */ -int journal_bmap(journal_t *journal, blk64_t block, unsigned long long *phys); -struct buffer_head *getblk(kdev_t ctx, blk64_t blocknr, int blocksize); +int jbd2_journal_bmap(journal_t *journal, unsigned long block, + unsigned long long *phys); +struct buffer_head *getblk(kdev_t ctx, unsigned long long blocknr, + int blocksize); int sync_blockdev(kdev_t kdev); -void ll_rw_block(int rw, int dummy, struct buffer_head *bh[]); +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); @@ -168,25 +268,8 @@ void wait_on_buffer(struct buffer_head *bh); #define J_ASSERT(x) assert(x) #define JSB_HAS_INCOMPAT_FEATURE(jsb, mask) \ - ((jsb)->s_header.h_blocktype == ext2fs_cpu_to_be32(JFS_SUPERBLOCK_V2) && \ + ((jsb)->s_header.h_blocktype == ext2fs_cpu_to_be32(JBD2_SUPERBLOCK_V2) && \ ((jsb)->s_feature_incompat & ext2fs_cpu_to_be32((mask)))) -static inline size_t journal_super_tag_bytes(journal_superblock_t *jsb) -{ - size_t sz; - - if (JSB_HAS_INCOMPAT_FEATURE(jsb, JFS_FEATURE_INCOMPAT_CSUM_V3)) - return sizeof(journal_block_tag3_t); - - sz = sizeof(journal_block_tag_t); - - if (JSB_HAS_INCOMPAT_FEATURE(jsb, JFS_FEATURE_INCOMPAT_CSUM_V2)) - sz += sizeof(__u16); - - if (JSB_HAS_INCOMPAT_FEATURE(jsb, JFS_FEATURE_INCOMPAT_64BIT)) - return sz; - - return sz - sizeof(__u32); -} #else /* !DEBUGFS */ extern e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ @@ -195,10 +278,34 @@ extern e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ do { if (!(assert)) { \ printf ("Assertion failure in %s() at %s line %d: " \ "\"%s\"\n", \ - __FUNCTION__, __FILE__, __LINE__, # assert); \ + __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 + +/* 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_record_cache(void); +extern void jbd2_journal_destroy_revoke_table_cache(void); +extern int jbd2_journal_init_revoke_record_cache(void); +extern int jbd2_journal_init_revoke_table_cache(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 */