diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
commit | f25e7804729d25bcfde575b78b501e06a8cbb708 (patch) | |
tree | d98e3220a7522671e6ce82a2d40bf878dfa3eccc /fsck/fsck.h | |
parent | 5668a2234ad79ffd45838679692d10236a3e965f (diff) | |
parent | 4f5a66a6eb77baa896d3adfb12139a830573f609 (diff) | |
download | android_external_f2fs-tools-f25e7804729d25bcfde575b78b501e06a8cbb708.tar.gz android_external_f2fs-tools-f25e7804729d25bcfde575b78b501e06a8cbb708.tar.bz2 android_external_f2fs-tools-f25e7804729d25bcfde575b78b501e06a8cbb708.zip |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Conflicts:
Android.mk
VERSION
fsck/dump.c
fsck/f2fs.h
fsck/fsck.c
fsck/main.c
fsck/mount.c
include/f2fs_fs.h
include/f2fs_version.h
lib/libf2fs.c
mkfs/Makefile.am
mkfs/f2fs_format.c
mkfs/f2fs_format_utils.c
mkfs/f2fs_format_utils.h
tools/f2fstat.c
tools/fibmap.c
Change-Id: I5cc044a6fe47bac6cab8d845f8d63729f765de50
Diffstat (limited to 'fsck/fsck.h')
-rw-r--r-- | fsck/fsck.h | 116 |
1 files changed, 40 insertions, 76 deletions
diff --git a/fsck/fsck.h b/fsck/fsck.h index 8c98c93..64b9984 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -31,6 +31,7 @@ struct f2fs_fsck { u32 multi_hard_link_files; u64 sit_valid_blocks; u32 sit_free_segs; + u32 free_segs; } chk; struct hard_link_node *hard_link_list_head; @@ -59,7 +60,8 @@ enum NODE_TYPE { TYPE_INODE = 37, TYPE_DIRECT_NODE = 43, TYPE_INDIRECT_NODE = 53, - TYPE_DOUBLE_INDIRECT_NODE = 67 + TYPE_DOUBLE_INDIRECT_NODE = 67, + TYPE_XATTR = 77 }; struct hard_link_node { @@ -76,76 +78,38 @@ enum seg_type { SEG_TYPE_MAX, }; -extern int fsck_chk_xattr_blk(struct f2fs_sb_info *sbi, u32 ino, u32 x_nid, u32 *blk_cnt); -extern int fsck_chk_orphan_node(struct f2fs_sb_info *sbi); - -extern int fsck_chk_node_blk(struct f2fs_sb_info *sbi, - struct f2fs_inode *inode, - u32 nid, - enum FILE_TYPE ftype, - enum NODE_TYPE ntype, - u32 *blk_cnt); - -extern int fsck_chk_inode_blk(struct f2fs_sb_info *sbi, - u32 nid, - enum FILE_TYPE ftype, - struct f2fs_node *node_blk, - u32 *blk_cnt, - struct node_info *ni); - -extern int fsck_chk_dnode_blk(struct f2fs_sb_info *sbi, - struct f2fs_inode *inode, - u32 nid, - enum FILE_TYPE ftype, - struct f2fs_node *node_blk, - u32 *blk_cnt, - struct node_info *ni); - -extern int fsck_chk_idnode_blk(struct f2fs_sb_info *sbi, - struct f2fs_inode *inode, - u32 nid, - enum FILE_TYPE ftype, - struct f2fs_node *node_blk, - u32 *blk_cnt); - -extern int fsck_chk_didnode_blk(struct f2fs_sb_info *sbi, - struct f2fs_inode *inode, - u32 nid, - enum FILE_TYPE ftype, - struct f2fs_node *node_blk, - u32 *blk_cnt); - -extern int fsck_chk_data_blk(struct f2fs_sb_info *sbi, - struct f2fs_inode *inode, - u32 blk_addr, - u32 *child_cnt, - u32 *child_files, - int last_blk, - enum FILE_TYPE ftype, - u32 parent_nid, - u16 idx_in_node, - u8 ver); - -extern int fsck_chk_dentry_blk(struct f2fs_sb_info *sbi, - struct f2fs_inode *inode, - u32 blk_addr, - u32 *child_cnt, - u32 *child_files, - int last_blk); - -extern void print_node_info(struct f2fs_node *node_block); -extern void print_inode_info(struct f2fs_inode *inode); -extern struct seg_entry *get_seg_entry(struct f2fs_sb_info *sbi, unsigned int segno); -extern int get_sum_block(struct f2fs_sb_info *sbi, unsigned int segno, struct f2fs_summary_block *sum_blk); -extern int get_sum_entry(struct f2fs_sb_info *sbi, u32 blk_addr, struct f2fs_summary *sum_entry); -extern int get_node_info(struct f2fs_sb_info *sbi, nid_t nid, struct node_info *ni); -extern void build_nat_area_bitmap(struct f2fs_sb_info *sbi); -extern int build_sit_area_bitmap(struct f2fs_sb_info *sbi); -extern int fsck_init(struct f2fs_sb_info *sbi); -extern int fsck_verify(struct f2fs_sb_info *sbi); -extern void fsck_free(struct f2fs_sb_info *sbi); -extern int f2fs_do_mount(struct f2fs_sb_info *sbi); -extern void f2fs_do_umount(struct f2fs_sb_info *sbi); +extern void fsck_chk_orphan_node(struct f2fs_sb_info *); +extern int fsck_chk_node_blk(struct f2fs_sb_info *, struct f2fs_inode *, u32, + enum FILE_TYPE, enum NODE_TYPE, u32 *); +extern void fsck_chk_inode_blk(struct f2fs_sb_info *, u32, enum FILE_TYPE, + struct f2fs_node *, u32 *, struct node_info *); +extern int fsck_chk_dnode_blk(struct f2fs_sb_info *, struct f2fs_inode *, + u32, enum FILE_TYPE, struct f2fs_node *, u32 *, + struct node_info *); +extern int fsck_chk_idnode_blk(struct f2fs_sb_info *, struct f2fs_inode *, + enum FILE_TYPE, struct f2fs_node *, u32 *); +extern int fsck_chk_didnode_blk(struct f2fs_sb_info *, struct f2fs_inode *, + enum FILE_TYPE, struct f2fs_node *, u32 *); +extern int fsck_chk_data_blk(struct f2fs_sb_info *sbi, u32, u32 *, u32 *, + int, enum FILE_TYPE, u32, u16, u8); +extern int fsck_chk_dentry_blk(struct f2fs_sb_info *, u32, u32 *, u32 *, int); + +extern void print_node_info(struct f2fs_node *); +extern void print_inode_info(struct f2fs_inode *); +extern struct seg_entry *get_seg_entry(struct f2fs_sb_info *, unsigned int); +extern int get_sum_block(struct f2fs_sb_info *, unsigned int, + struct f2fs_summary_block *); +extern int get_sum_entry(struct f2fs_sb_info *, u32, struct f2fs_summary *); +extern void get_node_info(struct f2fs_sb_info *, nid_t, struct node_info *); +extern void nullify_nat_entry(struct f2fs_sb_info *, u32); +extern void rewrite_sit_area_bitmap(struct f2fs_sb_info *); +extern void build_nat_area_bitmap(struct f2fs_sb_info *); +extern void build_sit_area_bitmap(struct f2fs_sb_info *); +extern void fsck_init(struct f2fs_sb_info *); +extern int fsck_verify(struct f2fs_sb_info *); +extern void fsck_free(struct f2fs_sb_info *); +extern int f2fs_do_mount(struct f2fs_sb_info *); +extern void f2fs_do_umount(struct f2fs_sb_info *); /* dump.c */ struct dump_option { @@ -154,12 +118,12 @@ struct dump_option { int end_sit; int start_ssa; int end_ssa; - u32 blk_addr; + int32_t blk_addr; }; -extern void sit_dump(struct f2fs_sb_info *sbi, int start_sit, int end_sit); -extern void ssa_dump(struct f2fs_sb_info *sbi, int start_ssa, int end_ssa); -extern int dump_node(struct f2fs_sb_info *sbi, nid_t nid); -extern int dump_inode_from_blkaddr(struct f2fs_sb_info *sbi, u32 blk_addr); +extern void sit_dump(struct f2fs_sb_info *, int, int); +extern void ssa_dump(struct f2fs_sb_info *, int, int); +extern void dump_node(struct f2fs_sb_info *, nid_t); +extern int dump_inode_from_blkaddr(struct f2fs_sb_info *, u32); #endif /* _FSCK_H_ */ |