The following commit has been merged in the master branch:
commit 2bde0b719f8a0aa69560c67594ff4432832f0184
Merge: e8c20d8edb9ef82cc05a0eb0a490ec1fa7cacd48
b16e72ae6a1c0941dbaa18e1381a68f6c6efd913
Author: Patrick Winnertz <win...@debian.org>
Date: Fri Mar 9 12:30:35 2012 +0100
Merge tag 'upstream/1.41.90.wc4'
Upstream version 1.41.90.wc4
diff --combined lib/ext2fs/ext2fs.h
index 4d9914e,6a422fe..7416745
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@@ -4,8 -4,8 +4,8 @@@
* Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
*
* %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
* %End-Header%
*/
@@@ -28,6 -28,10 +28,10 @@@ extern "C"
#if (!defined(__GNUC__) && !defined(__WATCOMC__))
#define NO_INLINE_FUNCS
#endif
+
+ #ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 600 /* for posix_memalign() */
+ #endif
/*
* Where the master copy of the superblock is located, and how big
@@@ -52,6 -56,7 +56,7 @@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+ #include <errno.h>
#if EXT2_FLAT_INCLUDES
#include "e2_types.h"
@@@ -68,6 -73,7 +73,7 @@@ typedef __u32 blk_t
typedef __u64 blk64_t;
typedef __u32 dgrp_t;
typedef __u32 ext2_off_t;
+ typedef __u64 ext2_off64_t;
typedef __s64 e2_blkcnt_t;
typedef __u32 ext2_dirhash_t;
@@@ -124,6 -130,13 +130,13 @@@ typedef struct ext2_struct_u32_iterate
/*
* ext2_dblist structure and abstractions (see dblist.c)
*/
+ struct ext2_db_entry2 {
+ ext2_ino_t ino;
+ blk64_t blk;
+ e2_blkcnt_t blockcnt;
+ };
+
+ /* Ye Olde 32-bit version */
struct ext2_db_entry {
ext2_ino_t ino;
blk_t blk;
@@@ -172,6 -185,10 +185,10 @@@ typedef struct ext2_file *ext2_file_t
#define EXT2_FLAG_EXCLUSIVE 0x4000
#define EXT2_FLAG_SOFTSUPP_FEATURES 0x8000
#define EXT2_FLAG_NOFREE_ON_ERROR 0x10000
+ #define EXT2_FLAG_64BITS 0x20000
+ #define EXT2_FLAG_PRINT_PROGRESS 0x40000
+ #define EXT2_FLAG_DIRECT_IO 0x80000
+ #define EXT2_FLAG_SKIP_MMP 0x100000
/*
* Special flag in the ext2 inode i_flag field that means that this is
@@@ -181,10 -198,20 +198,20 @@@
/*
* Flags for mkjournal
- *
- * EXT2_MKJOURNAL_V1_SUPER Make a (deprecated) V1 journal superblock
*/
- #define EXT2_MKJOURNAL_V1_SUPER 0x0000001
+ #define EXT2_MKJOURNAL_V1_SUPER 0x0000001 /* create V1 superblock
(deprecated) */
+ #define EXT2_MKJOURNAL_LAZYINIT 0x0000002 /* don't zero journal inode
before use*/
+
+ struct opaque_ext2_group_desc;
+
+ /*
+ * The timestamp in the MMP structure will be updated by e2fsck at some
+ * arbitary intervals (start of passes, after every EXT2_MMP_INODE_INTERVAL
+ * inodes in pass1 and pass1b). There is no guarantee that e2fsck is updating
+ * the MMP block in a timely manner, and the updates it does are purely for
+ * the convenience of the sysadmin and not for automatic validation.
+ */
+ #define EXT2_MMP_INODE_INTERVAL 20000
struct struct_ext2_filsys {
errcode_t magic;
@@@ -196,10 -223,11 +223,11 @@@
int fragsize;
dgrp_t group_desc_count;
unsigned long desc_blocks;
- struct ext2_group_desc * group_desc;
+ struct opaque_ext2_group_desc * group_desc;
int inode_blocks_per_group;
ext2fs_inode_bitmap inode_map;
ext2fs_block_bitmap block_map;
+ /* XXX FIXME-64: not 64-bit safe, but not used? */
errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks);
errcode_t (*check_directory)(ext2_filsys fs, ext2_ino_t ino);
errcode_t (*write_bitmaps)(ext2_filsys fs);
@@@ -231,6 -259,18 +259,18 @@@
io_channel image_io;
/*
+ * Buffers for Multiple mount protection(MMP) block.
+ */
+ void *mmp_buf;
+ void *mmp_cmp;
+ int mmp_fd;
+
+ /*
+ * Time at which e2fsck last updated the MMP block.
+ */
+ long mmp_last_written;
+
+ /*
* More callback functions
*/
errcode_t (*get_alloc_block)(ext2_filsys fs, blk64_t goal,
@@@ -458,7 -498,7 +498,7 @@@ typedef struct ext2_struct_inode_scan *
/*
* ext2 size of an inode
*/
-#define EXT2_I_SIZE(i) ((i)->i_size | ((__u64) (i)->i_size_high << 32))
+#define EXT2_I_SIZE(i) ((i).i_size | ((__u64) (i).i_size_high << 32))
/*
* ext2_icount_t abstraction
@@@ -491,6 -531,12 +531,12 @@@ typedef struct ext2_icount *ext2_icount
#define EXT2_CHECK_MAGIC(struct, code) \
if ((struct)->magic != (code)) return (code)
+ /*
+ * Flags for returning status of ext2fs_expand_extra_isize()
+ */
+ #define EXT2_EXPAND_EISIZE_UNSAFE 0x0001
+ #define EXT2_EXPAND_EISIZE_NEW_BLOCK 0x0002
+ #define EXT2_EXPAND_EISIZE_NOSPC 0x0004
/*
* For ext2 compression support
@@@ -522,14 -568,22 +568,22 @@@
EXT2_FEATURE_INCOMPAT_META_BG|\
EXT3_FEATURE_INCOMPAT_RECOVER|\
EXT3_FEATURE_INCOMPAT_EXTENTS|\
- EXT4_FEATURE_INCOMPAT_FLEX_BG)
+ EXT4_FEATURE_INCOMPAT_FLEX_BG|\
+ EXT4_FEATURE_INCOMPAT_MMP|\
+ EXT4_FEATURE_INCOMPAT_EA_INODE|\
+ EXT4_FEATURE_INCOMPAT_DIRDATA|\
+ EXT4_FEATURE_INCOMPAT_64BIT)
#else
#define EXT2_LIB_FEATURE_INCOMPAT_SUPP
(EXT2_FEATURE_INCOMPAT_FILETYPE|\
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|\
EXT2_FEATURE_INCOMPAT_META_BG|\
EXT3_FEATURE_INCOMPAT_RECOVER|\
EXT3_FEATURE_INCOMPAT_EXTENTS|\
- EXT4_FEATURE_INCOMPAT_FLEX_BG)
+ EXT4_FEATURE_INCOMPAT_FLEX_BG|\
+ EXT4_FEATURE_INCOMPAT_MMP|\
+ EXT4_FEATURE_INCOMPAT_EA_INODE|\
+ EXT4_FEATURE_INCOMPAT_DIRDATA|\
+ EXT4_FEATURE_INCOMPAT_64BIT)
#endif
#define EXT2_LIB_FEATURE_RO_COMPAT_SUPP
(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER|\
EXT4_FEATURE_RO_COMPAT_HUGE_FILE|\
@@@ -554,12 -608,20 +608,20 @@@ extern errcode_t ext2fs_new_inode(ext2_
ext2fs_inode_bitmap map, ext2_ino_t *ret);
extern errcode_t ext2fs_new_block(ext2_filsys fs, blk_t goal,
ext2fs_block_bitmap map, blk_t *ret);
+ extern errcode_t ext2fs_new_block2(ext2_filsys fs, blk64_t goal,
+ ext2fs_block_bitmap map, blk64_t *ret);
extern errcode_t ext2fs_get_free_blocks(ext2_filsys fs, blk_t start,
blk_t finish, int num,
ext2fs_block_bitmap map,
blk_t *ret);
+ extern errcode_t ext2fs_get_free_blocks2(ext2_filsys fs, blk64_t start,
+ blk64_t finish, int num,
+ ext2fs_block_bitmap map,
+ blk64_t *ret);
extern errcode_t ext2fs_alloc_block(ext2_filsys fs, blk_t goal,
char *block_buf, blk_t *ret);
+ extern errcode_t ext2fs_alloc_block2(ext2_filsys fs, blk64_t goal,
+ char *block_buf, blk64_t *ret);
extern void ext2fs_set_alloc_block_callback(ext2_filsys fs,
errcode_t (*func)(ext2_filsys fs,
blk64_t goal,
@@@ -585,6 -647,7 +647,7 @@@ void ext2fs_inode_alloc_stats(ext2_fils
void ext2fs_inode_alloc_stats2(ext2_filsys fs, ext2_ino_t ino,
int inuse, int isdir);
void ext2fs_block_alloc_stats(ext2_filsys fs, blk_t blk, int inuse);
+ void ext2fs_block_alloc_stats2(ext2_filsys fs, blk64_t blk, int inuse);
/* alloc_tables.c */
extern errcode_t ext2fs_allocate_tables(ext2_filsys fs);
@@@ -656,14 -719,22 +719,22 @@@ extern errcode_t ext2fs_fudge_inode_bit
ext2_ino_t end, ext2_ino_t
*oend);
extern errcode_t ext2fs_fudge_block_bitmap_end(ext2fs_block_bitmap bitmap,
blk_t end, blk_t *oend);
+ extern errcode_t ext2fs_fudge_block_bitmap_end2(ext2fs_block_bitmap bitmap,
+ blk64_t end, blk64_t *oend);
extern void ext2fs_clear_inode_bitmap(ext2fs_inode_bitmap bitmap);
extern void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap);
extern errcode_t ext2fs_read_bitmaps(ext2_filsys fs);
extern errcode_t ext2fs_write_bitmaps(ext2_filsys fs);
extern errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
ext2fs_inode_bitmap bmap);
+ extern errcode_t ext2fs_resize_inode_bitmap2(__u64 new_end,
+ __u64 new_real_end,
+ ext2fs_inode_bitmap bmap);
extern errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
ext2fs_block_bitmap bmap);
+ extern errcode_t ext2fs_resize_block_bitmap2(__u64 new_end,
+ __u64 new_real_end,
+ ext2fs_block_bitmap bmap);
extern errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
ext2fs_block_bitmap bm2);
extern errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
@@@ -671,16 -742,85 +742,85 @@@
extern errcode_t ext2fs_set_inode_bitmap_range(ext2fs_inode_bitmap bmap,
ext2_ino_t start, unsigned int num,
void *in);
+ extern errcode_t ext2fs_set_inode_bitmap_range2(ext2fs_inode_bitmap bmap,
+ __u64 start, size_t num,
+ void *in);
extern errcode_t ext2fs_get_inode_bitmap_range(ext2fs_inode_bitmap bmap,
ext2_ino_t start, unsigned int num,
void *out);
+ extern errcode_t ext2fs_get_inode_bitmap_range2(ext2fs_inode_bitmap bmap,
+ __u64 start, size_t num,
+ void *out);
extern errcode_t ext2fs_set_block_bitmap_range(ext2fs_block_bitmap bmap,
blk_t start, unsigned int num,
void *in);
+ extern errcode_t ext2fs_set_block_bitmap_range2(ext2fs_block_bitmap bmap,
+ blk64_t start, size_t num,
+ void *in);
extern errcode_t ext2fs_get_block_bitmap_range(ext2fs_block_bitmap bmap,
blk_t start, unsigned int num,
void *out);
-
+ extern errcode_t ext2fs_get_block_bitmap_range2(ext2fs_block_bitmap bmap,
+ blk64_t start, size_t num,
+ void *out);
+
+ /* blknum.c */
+ extern dgrp_t ext2fs_group_of_blk2(ext2_filsys fs, blk64_t);
+ extern blk64_t ext2fs_group_first_block2(ext2_filsys fs, dgrp_t group);
+ extern blk64_t ext2fs_group_last_block2(ext2_filsys fs, dgrp_t group);
+ extern blk64_t ext2fs_inode_data_blocks2(ext2_filsys fs,
+ struct ext2_inode *inode);
+ extern blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
+ struct ext2_inode *inode);
+ extern blk64_t ext2fs_blocks_count(struct ext2_super_block *super);
+ extern void ext2fs_blocks_count_set(struct ext2_super_block *super,
+ blk64_t blk);
+ extern void ext2fs_blocks_count_add(struct ext2_super_block *super,
+ blk64_t blk);
+ extern blk64_t ext2fs_r_blocks_count(struct ext2_super_block *super);
+ extern void ext2fs_r_blocks_count_set(struct ext2_super_block *super,
+ blk64_t blk);
+ extern void ext2fs_r_blocks_count_add(struct ext2_super_block *super,
+ blk64_t blk);
+ extern blk64_t ext2fs_free_blocks_count(struct ext2_super_block *super);
+ extern void ext2fs_free_blocks_count_set(struct ext2_super_block *super,
+ blk64_t blk);
+ extern void ext2fs_free_blocks_count_add(struct ext2_super_block *super,
+ blk64_t blk);
+ /* Block group descriptor accessor functions */
+ extern struct ext2_group_desc *ext2fs_group_desc(ext2_filsys fs,
+ struct opaque_ext2_group_desc *gdp,
+ dgrp_t group);
+ extern blk64_t ext2fs_block_bitmap_loc(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group,
+ blk64_t blk);
+ extern blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_inode_bitmap_loc_set(ext2_filsys fs, dgrp_t group,
+ blk64_t blk);
+ extern blk64_t ext2fs_inode_table_loc(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_inode_table_loc_set(ext2_filsys fs, dgrp_t group,
+ blk64_t blk);
+ extern __u32 ext2fs_bg_free_blocks_count(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_bg_free_blocks_count_set(ext2_filsys fs, dgrp_t group,
+ __u32 n);
+ extern __u32 ext2fs_bg_free_inodes_count(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_bg_free_inodes_count_set(ext2_filsys fs, dgrp_t group,
+ __u32 n);
+ extern __u32 ext2fs_bg_used_dirs_count(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_bg_used_dirs_count_set(ext2_filsys fs, dgrp_t group,
+ __u32 n);
+ extern __u32 ext2fs_bg_itable_unused(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_bg_itable_unused_set(ext2_filsys fs, dgrp_t group,
+ __u32 n);
+ extern __u16 ext2fs_bg_flags(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_bg_flags_zap(ext2_filsys fs, dgrp_t group);
+ extern int ext2fs_bg_flags_test(ext2_filsys fs, dgrp_t group, __u16 bg_flag);
+ extern void ext2fs_bg_flags_set(ext2_filsys fs, dgrp_t group, __u16 bg_flags);
+ extern void ext2fs_bg_flags_clear(ext2_filsys fs, dgrp_t group, __u16
bg_flags);
+ extern __u16 ext2fs_bg_checksum(ext2_filsys fs, dgrp_t group);
+ extern void ext2fs_bg_checksum_set(ext2_filsys fs, dgrp_t group, __u16
checksum);
+ extern blk64_t ext2fs_file_acl_block(const struct ext2_inode *inode);
+ extern void ext2fs_file_acl_block_set(struct ext2_inode *inode, blk64_t blk);
/* block.c */
extern errcode_t ext2fs_block_iterate(ext2_filsys fs,
@@@ -703,6 -843,17 +843,17 @@@ errcode_t ext2fs_block_iterate2(ext2_fi
int ref_offset,
void *priv_data),
void *priv_data);
+ errcode_t ext2fs_block_iterate3(ext2_filsys fs,
+ ext2_ino_t ino,
+ int flags,
+ char *block_buf,
+ int (*func)(ext2_filsys fs,
+ blk64_t *blocknr,
+ e2_blkcnt_t blockcnt,
+ blk64_t ref_blk,
+ int ref_offset,
+ void *priv_data),
+ void *priv_data);
/* bmap.c */
extern errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino,
@@@ -729,6 -880,12 +880,12 @@@ extern errcode_t ext2fs_check_desc(ext2
extern errcode_t ext2fs_close(ext2_filsys fs);
extern errcode_t ext2fs_flush(ext2_filsys fs);
extern int ext2fs_bg_has_super(ext2_filsys fs, int group_block);
+ extern errcode_t ext2fs_super_and_bgd_loc2(ext2_filsys fs,
+ dgrp_t group,
+ blk64_t *ret_super_blk,
+ blk64_t *ret_old_desc_blk,
+ blk64_t *ret_new_desc_blk,
+ blk_t *ret_used_blks);
extern int ext2fs_super_and_bgd_loc(ext2_filsys fs,
dgrp_t group,
blk_t *ret_super_blk,
@@@ -748,20 -905,34 +905,34 @@@ extern errcode_t ext2fs_get_num_dirs(ex
extern errcode_t ext2fs_init_dblist(ext2_filsys fs, ext2_dblist *ret_dblist);
extern errcode_t ext2fs_add_dir_block(ext2_dblist dblist, ext2_ino_t ino,
blk_t blk, int blockcnt);
+ extern errcode_t ext2fs_add_dir_block2(ext2_dblist dblist, ext2_ino_t ino,
+ blk64_t blk, e2_blkcnt_t blockcnt);
extern void ext2fs_dblist_sort(ext2_dblist dblist,
EXT2_QSORT_TYPE (*sortfunc)(const void *,
const void *));
+ extern void ext2fs_dblist_sort2(ext2_dblist dblist,
+ EXT2_QSORT_TYPE (*sortfunc)(const void *,
+ const void *));
extern errcode_t ext2fs_dblist_iterate(ext2_dblist dblist,
int (*func)(ext2_filsys fs, struct ext2_db_entry *db_info,
void *priv_data),
void *priv_data);
+ extern errcode_t ext2fs_dblist_iterate2(ext2_dblist dblist,
+ int (*func)(ext2_filsys fs, struct ext2_db_entry2 *db_info,
+ void *priv_data),
+ void *priv_data);
extern errcode_t ext2fs_set_dir_block(ext2_dblist dblist, ext2_ino_t ino,
blk_t blk, int blockcnt);
+ extern errcode_t ext2fs_set_dir_block2(ext2_dblist dblist, ext2_ino_t ino,
+ blk64_t blk, e2_blkcnt_t blockcnt);
extern errcode_t ext2fs_copy_dblist(ext2_dblist src,
ext2_dblist *dest);
extern int ext2fs_dblist_count(ext2_dblist dblist);
+ extern blk64_t ext2fs_dblist_count2(ext2_dblist dblist);
extern errcode_t ext2fs_dblist_get_last(ext2_dblist dblist,
struct ext2_db_entry **entry);
+ extern errcode_t ext2fs_dblist_get_last2(ext2_dblist dblist,
+ struct ext2_db_entry2 **entry);
extern errcode_t ext2fs_dblist_drop_last(ext2_dblist dblist);
/* dblist_dir.c */
@@@ -783,10 -954,14 +954,14 @@@ extern errcode_t ext2fs_read_dir_block(
void *buf);
extern errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
void *buf, int flags);
+ extern errcode_t ext2fs_read_dir_block3(ext2_filsys fs, blk64_t block,
+ void *buf, int flags);
extern errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
void *buf);
extern errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
void *buf, int flags);
+ extern errcode_t ext2fs_write_dir_block3(ext2_filsys fs, blk64_t block,
+ void *buf, int flags);
/* dirhash.c */
extern errcode_t ext2fs_dirhash(int version, const char *name, int len,
@@@ -832,14 -1007,35 +1007,35 @@@ extern errcode_t ext2fs_dup_handle(ext2
extern errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir);
/* ext_attr.c */
+ extern errcode_t ext2fs_attr_get(ext2_filsys fs, struct ext2_inode *inode,
+ int name_index, const char *name, char *buffer,
+ size_t buffer_size, int *easize);
+
extern __u32 ext2fs_ext_attr_hash_entry(struct ext2_ext_attr_entry *entry,
void *data);
+ int ext2fs_attr_get_next_attr(struct ext2_ext_attr_entry *entry, int
name_index,
+ char *buffer, int buffer_size, int start);
+ errcode_t ext2fs_attr_set(ext2_filsys fs, ext2_ino_t ino,
+ struct ext2_inode *inode,
+ int name_index, const char *name, const char *value,
+ int value_len, int flags);
+ extern errcode_t ext2fs_expand_extra_isize(ext2_filsys fs, ext2_ino_t ino,
+ struct ext2_inode_large *inode,
+ int new_extra_isize, int *ret,
+ int *needed_size);
extern errcode_t ext2fs_read_ext_attr(ext2_filsys fs, blk_t block, void *buf);
+ extern errcode_t ext2fs_read_ext_attr2(ext2_filsys fs, blk64_t block,
+ void *buf);
extern errcode_t ext2fs_write_ext_attr(ext2_filsys fs, blk_t block,
void *buf);
+ extern errcode_t ext2fs_write_ext_attr2(ext2_filsys fs, blk64_t block,
+ void *buf);
extern errcode_t ext2fs_adjust_ea_refcount(ext2_filsys fs, blk_t blk,
char *block_buf,
int adjust, __u32 *newcount);
+ extern errcode_t ext2fs_adjust_ea_refcount2(ext2_filsys fs, blk64_t blk,
+ char *block_buf,
+ int adjust, __u32 *newcount);
/* extent.c */
extern errcode_t ext2fs_extent_header_verify(void *ptr, int size);
@@@ -871,6 -1067,7 +1067,7 @@@ extern errcode_t ext2fs_file_open2(ext2
extern errcode_t ext2fs_file_open(ext2_filsys fs, ext2_ino_t ino,
int flags, ext2_file_t *ret);
extern ext2_filsys ext2fs_file_get_fs(ext2_file_t file);
+ struct ext2_inode *ext2fs_file_get_inode(ext2_file_t file);
extern errcode_t ext2fs_file_close(ext2_file_t file);
extern errcode_t ext2fs_file_flush(ext2_file_t file);
extern errcode_t ext2fs_file_read(ext2_file_t file, void *buf,
@@@ -884,6 -1081,7 +1081,7 @@@ extern errcode_t ext2fs_file_lseek(ext2
errcode_t ext2fs_file_get_lsize(ext2_file_t file, __u64 *ret_size);
extern ext2_off_t ext2fs_file_get_size(ext2_file_t file);
extern errcode_t ext2fs_file_set_size(ext2_file_t file, ext2_off_t size);
+ extern errcode_t ext2fs_file_set_size2(ext2_file_t file, ext2_off64_t size);
/* finddev.c */
extern char *ext2fs_find_block_device(dev_t device);
@@@ -934,6 -1132,33 +1132,33 @@@ extern errcode_t ext2fs_set_generic_bit
__u32 start, __u32 num,
void *in);
+ /* gen_bitmap64.c */
+ void ext2fs_free_generic_bmap(ext2fs_generic_bitmap bmap);
+ errcode_t ext2fs_alloc_generic_bmap(ext2_filsys fs, errcode_t magic,
+ int type, __u64 start, __u64 end,
+ __u64 real_end,
+ const char *descr,
+ ext2fs_generic_bitmap *ret);
+ errcode_t ext2fs_copy_generic_bmap(ext2fs_generic_bitmap src,
+ ext2fs_generic_bitmap *dest);
+ void ext2fs_clear_generic_bmap(ext2fs_generic_bitmap bitmap);
+ errcode_t ext2fs_fudge_generic_bmap_end(ext2fs_generic_bitmap bitmap,
+ errcode_t neq,
+ __u64 end, __u64 *oend);
+ void ext2fs_set_generic_bmap_padding(ext2fs_generic_bitmap bmap);
+ errcode_t ext2fs_resize_generic_bmap(ext2fs_generic_bitmap bmap,
+ __u64 new_end,
+ __u64 new_real_end);
+ errcode_t ext2fs_compare_generic_bmap(errcode_t neq,
+ ext2fs_generic_bitmap bm1,
+ ext2fs_generic_bitmap bm2);
+ errcode_t ext2fs_get_generic_bmap_range(ext2fs_generic_bitmap bmap,
+ __u64 start, unsigned int num,
+ void *out);
+ errcode_t ext2fs_set_generic_bmap_range(ext2fs_generic_bitmap bmap,
+ __u64 start, unsigned int num,
+ void *in);
+
/* getsize.c */
extern errcode_t ext2fs_get_device_size(const char *file, int blocksize,
blk_t *retblocks);
@@@ -942,6 -1167,7 +1167,7 @@@ extern errcode_t ext2fs_get_device_size
/* getsectsize.c */
errcode_t ext2fs_get_device_sectsize(const char *file, int *sectsize);
+ errcode_t ext2fs_get_device_phys_sectsize(const char *file, int *sectsize);
/* i_block.c */
errcode_t ext2fs_iblk_add_blocks(ext2_filsys fs, struct ext2_inode *inode,
@@@ -969,6 -1195,7 +1195,7 @@@ extern errcode_t ext2fs_initialize(cons
/* icount.c */
extern void ext2fs_free_icount(ext2_icount_t icount);
+ extern int ext2fs_icount_is_set(ext2_icount_t icount, ext2_ino_t ino);
extern errcode_t ext2fs_create_icount_tdb(ext2_filsys fs, char *tdb_dir,
int flags, ext2_icount_t *ret);
extern errcode_t ext2fs_create_icount2(ext2_filsys fs, int flags,
@@@ -1038,6 -1265,12 +1265,12 @@@ extern errcode_t ext2fs_check_if_mounte
extern errcode_t ext2fs_check_mount_point(const char *device, int
*mount_flags,
char *mtpt, int mtlen);
+ /* punch.c */
+ extern errcode_t ext2fs_punch(ext2_filsys fs, ext2_ino_t ino,
+ struct ext2_inode *inode,
+ char *block_buf, blk64_t start,
+ blk64_t end);
+
/* namei.c */
extern errcode_t ext2fs_lookup(ext2_filsys fs, ext2_ino_t dir, const char
*name,
int namelen, char *buf, ext2_ino_t *inode);
@@@ -1062,12 -1295,14 +1295,14 @@@ extern errcode_t ext2fs_mkdir(ext2_fils
/* mkjournal.c */
extern errcode_t ext2fs_zero_blocks(ext2_filsys fs, blk_t blk, int num,
blk_t *ret_blk, int *ret_count);
+ extern errcode_t ext2fs_zero_blocks2(ext2_filsys fs, blk64_t blk, int num,
+ blk64_t *ret_blk, int *ret_count);
extern errcode_t ext2fs_create_journal_superblock(ext2_filsys fs,
- __u32 size, int flags,
+ __u32 blocks, int flags,
char **ret_jsb);
extern errcode_t ext2fs_add_journal_device(ext2_filsys fs,
ext2_filsys journal_dev);
- extern errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size,
+ extern errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t blocks,
int flags);
extern int ext2fs_default_journal_size(__u64 blocks);
@@@ -1079,6 -1314,8 +1314,8 @@@ extern errcode_t ext2fs_open2(const cha
int flags, int superblock,
unsigned int block_size, io_manager manager,
ext2_filsys *ret_fs);
+ extern blk64_t ext2fs_descriptor_block_loc2(ext2_filsys fs,
+ blk64_t group_block, dgrp_t i);
extern blk_t ext2fs_descriptor_block_loc(ext2_filsys fs, blk_t group_block,
dgrp_t i);
errcode_t ext2fs_get_data_io(ext2_filsys fs, io_channel *old_io);
@@@ -1095,6 -1332,16 +1332,16 @@@ errcode_t ext2fs_link(ext2_filsys fs, e
errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, const char *name,
ext2_ino_t ino, int flags);
+ /* mmp.c */
+ errcode_t ext2fs_mmp_read(ext2_filsys fs, blk64_t mmp_blk, void *buf);
+ errcode_t ext2fs_mmp_write(ext2_filsys fs, blk64_t mmp_blk, void *buf);
+ errcode_t ext2fs_mmp_clear(ext2_filsys fs);
+ errcode_t ext2fs_mmp_init(ext2_filsys fs);
+ errcode_t ext2fs_mmp_start(ext2_filsys fs);
+ errcode_t ext2fs_mmp_update(ext2_filsys fs);
+ errcode_t ext2fs_mmp_stop(ext2_filsys fs);
+ unsigned ext2fs_mmp_new_seq();
+
/* read_bb.c */
extern errcode_t ext2fs_read_bb_inode(ext2_filsys fs,
ext2_badblocks_list *bb_list);
@@@ -1124,11 -1371,13 +1371,13 @@@ extern void ext2fs_swap_ext_attr_entry(
struct ext2_ext_attr_entry *from_entry);
extern void ext2fs_swap_super(struct ext2_super_block * super);
extern void ext2fs_swap_group_desc(struct ext2_group_desc *gdp);
+ extern void ext2fs_swap_group_desc2(ext2_filsys, struct ext2_group_desc *gdp);
extern void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
struct ext2_inode_large *f, int hostorder,
int bufsize);
extern void ext2fs_swap_inode(ext2_filsys fs,struct ext2_inode *t,
struct ext2_inode *f, int hostorder);
+ extern void ext2fs_swap_mmp(struct mmp_struct *mmp);
/* valid_blk.c */
extern int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode);
@@@ -1146,7 -1395,8 +1395,8 @@@ extern errcode_t ext2fs_write_bb_FILE(e
/* inline functions */
extern errcode_t ext2fs_get_mem(unsigned long size, void *ptr);
- extern errcode_t ext2fs_get_array(unsigned long count, unsigned long size,
void *ptr);
+ extern errcode_t ext2fs_get_memalign(unsigned long size,
+ unsigned long align, void *ptr);
extern errcode_t ext2fs_free_mem(void *ptr);
extern errcode_t ext2fs_resize_mem(unsigned long old_size,
unsigned long size, void *ptr);
@@@ -1167,6 -1417,7 +1417,7 @@@ extern blk_t ext2fs_group_last_block(ex
extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
struct ext2_inode *inode);
extern unsigned int ext2fs_div_ceil(unsigned int a, unsigned int b);
+ extern __u64 ext2fs_div64_ceil(__u64 a, __u64 b);
/*
* The actual inlined functions definitions themselves...
@@@ -1201,6 -1452,22 +1452,22 @@@ _INLINE_ errcode_t ext2fs_get_mem(unsig
return 0;
}
+ _INLINE_ errcode_t ext2fs_get_memalign(unsigned long size,
+ unsigned long align, void *ptr)
+ {
+ errcode_t retval;
+
+ if (align == 0)
+ align = 8;
+ retval = posix_memalign((void **)ptr, align, size);
+ if (retval != 0) {
+ if (retval == ENOMEM)
+ return EXT2_ET_NO_MEMORY;
+ return retval;
+ }
+ return 0;
+ }
+
_INLINE_ errcode_t ext2fs_get_array(unsigned long count, unsigned long size,
void *ptr)
{
if (count && (-1UL)/count<size)
@@@ -1326,10 -1593,8 +1593,8 @@@ _INLINE_ int ext2fs_test_bb_dirty(ext2_
*/
_INLINE_ int ext2fs_group_of_blk(ext2_filsys fs, blk_t blk)
{
- return (blk - fs->super->s_first_data_block) /
- fs->super->s_blocks_per_group;
+ return ext2fs_group_of_blk2(fs, blk);
}
-
/*
* Return the group # of an inode number
*/
@@@ -1343,8 -1608,7 +1608,7 @@@ _INLINE_ int ext2fs_group_of_ino(ext2_f
*/
_INLINE_ blk_t ext2fs_group_first_block(ext2_filsys fs, dgrp_t group)
{
- return fs->super->s_first_data_block +
- (group * fs->super->s_blocks_per_group);
+ return ext2fs_group_first_block2(fs, group);
}
/*
@@@ -1352,17 -1616,13 +1616,13 @@@
*/
_INLINE_ blk_t ext2fs_group_last_block(ext2_filsys fs, dgrp_t group)
{
- return (group == fs->group_desc_count - 1 ?
- fs->super->s_blocks_count - 1 :
- ext2fs_group_first_block(fs, group) +
- (fs->super->s_blocks_per_group - 1));
+ return ext2fs_group_last_block2(fs, group);
}
_INLINE_ blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
struct ext2_inode *inode)
{
- return inode->i_blocks -
- (inode->i_file_acl ? fs->blocksize >> 9 : 0);
+ return ext2fs_inode_data_blocks2(fs, inode);
}
/*
@@@ -1374,6 -1634,32 +1634,32 @@@ _INLINE_ unsigned int ext2fs_div_ceil(u
return 0;
return ((a - 1) / b) + 1;
}
+
+ _INLINE_ __u64 ext2fs_div64_ceil(__u64 a, __u64 b)
+ {
+ if (!a)
+ return 0;
+ return ((a - 1) / b) + 1;
+ }
+
+
+ _INLINE_ struct ext2_dx_root_info* get_ext2_dx_root_info(ext2_filsys fs, char
*buf)
+ {
+ struct ext2_dir_entry_2 * de = (struct ext2_dir_entry_2 *) buf;
+
+ if (!(fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA))
+ return (struct ext2_dx_root_info *)(buf +
+ __EXT2_DIR_REC_LEN(1) +__EXT2_DIR_REC_LEN(2));
+
+ /* get dotdot first */
+ de = (struct ext2_dir_entry_2 *)((char *)de + de->rec_len);
+
+ /* dx root info is after dotdot entry */
+ de = (struct ext2_dir_entry_2 *)((char *)de + EXT2_DIR_REC_LEN(de));
+
+ return (struct ext2_dx_root_info*) de;
+ }
+
#undef _INLINE_
#endif
--
Repository for maintaining lidskfsprogs
_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit
