libf2fs: enhance the bit operations
PATCH 1/6 libf2fs: enhance the bit operations
This patch modifies the existing bit operations.
--- fsck/fsck.c | 12 +++---- include/f2fs_fs.h | 23 ++++++++++-- lib/libf2fs.c | 104 ++++++++++++++++++++++++------------------------------ 3 files changed, 73 insertions(+), 66 deletions(-)
fsck/fsck.c +6 -6
@@ -820,7 +820,7 @@ static void convert_encrypted_name(unsigned char *name, int len, }static void print_dentry (__u32 depth,__u8 *name, -unsigned long *bitmap, +unsigned char *bitmap,struct f2fs_dir_entry *dentry,int max,int idx,int last_blk,int encrypted) {
@@ -837,7 +837,7 @@ static void print_dentry(__u32 depth, __u8 *name, name_len =le16_to_cpu (dentry[idx].name_len); next_idx = idx + (name_len +F2FS_SLOT_LEN -1 ) /F2FS_SLOT_LEN ; - bit_offset =find_next_bit (bitmap, max, next_idx); + bit_offset =find_next_bit_le (bitmap, max, next_idx);if (bit_offset >= max && last_blk) last_de =1 ;
@@ -889,7 +889,7 @@ static int f2fs_check_hash_code(struct f2fs_dir_entry *dentry, }static int __chk_dentries (struct f2fs_sb_info *sbi,struct child_info *child, -unsigned long *bitmap, +unsigned char *bitmap,struct f2fs_dir_entry *dentry,__u8 (*filenames)[F2FS_SLOT_LEN ],int max,int last_blk,int encrypted)
@@ -946,7 +946,7 @@ static int __chk_dentries(struct f2fs_sb_info *sbi, struct child_info *child, ftype = dentry[i].file_type;if ((ftype <=F2FS_FT_UNKNOWN || ftype >F2FS_FT_LAST_FILE_TYPE )) { -ASSERT_MSG ("Bad dentry 0x%x with unexpected ftype 0x%x" , i, ftype); +ASSERT_MSG ("Bad dentry 0x%x with unexpected ftype 0x%x" , ino, ftype);if (config.fix_on) {FIX_MSG ("Clear bad dentry 0x%x with bad ftype 0x%x" , i, ftype);
@@ -1036,7 +1036,7 @@ int fsck_chk_inline_dentries(struct f2fs_sb_info *sbi, fsck->dentry_depth++; dentries =__chk_dentries (sbi, child, - (unsigned long *)de_blk->dentry_bitmap, + de_blk->dentry_bitmap, de_blk->dentry, de_blk->filename,NR_INLINE_DENTRY ,1 ,file_is_encrypt (node_blk->i.i_advise));
@@ -1068,7 +1068,7 @@ int fsck_chk_dentry_blk(struct f2fs_sb_info *sbi, u32 blk_addr, fsck->dentry_depth++; dentries =__chk_dentries (sbi, child, - (unsigned long *)de_blk->dentry_bitmap, + de_blk->dentry_bitmap, de_blk->dentry, de_blk->filename,NR_DENTRY_IN_BLOCK , last_blk, encrypted);
include/f2fs_fs.h +21 -2
@@ -320,6 +320,23 @@ struct f2fs_configuration { })/* +* Copied from include/linux/kernel.h +*/ +#define __round_mask (x, y) ((__typeof__(x))((y)-1)) +#define round_down (x, y) ((x) & ~__round_mask(x, y)) +#define min (x, y) ({ \ + typeof(x) _min1 = (x); \ + typeof(y) _min2 = (y); \ + (void) (&_min1 == &_min2); \ + _min1 < _min2 ? _min1 : _min2; }) + +#define max (x, y) ({ \ + typeof(x) _max1 = (x); \ + typeof(y) _max2 = (y); \ + (void) (&_max1 == &_max2); \ + _max1 > _max2 ? _max1 : _max2; }) + +/* * Copied from fs/f2fs/f2fs.h */ #define NR_CURSEG_DATA_TYPE (3)
@@ -834,8 +851,10 @@ extern int test_bit(unsigned int nr, const void * addr);extern int f2fs_test_bit (unsigned int ,const char *);extern int f2fs_set_bit (unsigned int ,char *);extern int f2fs_clear_bit (unsigned int ,char *); -extern unsigned long find_next_bit (const unsigned long *, -unsigned long ,unsigned long ); +extern unsigned long find_next_bit_le (const unsigned char *,unsigned long , +unsigned long ); +extern unsigned long find_next_zero_bit_le (const unsigned char *,unsigned long , +unsigned long );extern u_int32_t f2fs_cal_crc32 (u_int32_t ,void *,int );extern int f2fs_crc_valid (u_int32_t blk_crc,void *buf,int len);
lib/libf2fs.c +46 -58
140 lines not on this page · raw message
Signature · 4 lines
2.5.4 (Apple Git-61) ------------------------------------------------------------------------------
PATCH 2/6 fsck.f2fs: sanity_check for extent_cache entry
This patch adds to check the stored extent_cache entry is consistent or not.
--- fsck/fsck.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++-------------- fsck/fsck.h | 17 +++++++++--- fsck/main.c | 2 +- 3 files changed, 82 insertions(+), 24 deletions(-)
fsck/fsck.c +68 -19
@@ -468,7 +468,8 @@ out:int fsck_chk_node_blk (struct f2fs_sb_info *sbi,struct f2fs_inode *inode,u32 nid,u8 *name,enum FILE_TYPE ftype,enum NODE_TYPE ntype, -u32 *blk_cnt,struct child_info *child) +u32 *blk_cnt,struct child_info *child, +struct extent_info *i_ext) {struct node_info ni;struct f2fs_node *node_blk =NULL ;
@@ -487,19 +488,19 @@ int fsck_chk_node_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,f2fs_set_main_bitmap (sbi, ni.blk_addr,CURSEG_WARM_NODE );fsck_chk_dnode_blk (sbi, inode, nid, ftype, node_blk, - blk_cnt, child, &ni); + blk_cnt, child, &ni, i_ext);break ;case TYPE_INDIRECT_NODE :f2fs_set_main_bitmap (sbi, ni.blk_addr,CURSEG_COLD_NODE );fsck_chk_idnode_blk (sbi, inode, ftype, node_blk, - blk_cnt, child); + blk_cnt, child, i_ext);break ;case TYPE_DOUBLE_INDIRECT_NODE :f2fs_set_main_bitmap (sbi, ni.blk_addr,CURSEG_COLD_NODE );fsck_chk_didnode_blk (sbi, inode, ftype, node_blk, - blk_cnt, child); + blk_cnt, child, i_ext);break ;default :ASSERT (0 );
@@ -512,6 +513,26 @@ err:return -EINVAL ; } +static void update_i_extent (struct extent_info *i_ext,block_t blkaddr) +{ +block_t end_addr; + +if (!i_ext) +return ; + + end_addr = i_ext->ext.blk_addr + i_ext->ext.len; + +/* TODO: check its file offset later */ +if (blkaddr >= i_ext->ext.blk_addr && blkaddr < end_addr) { +unsigned int offset = blkaddr - i_ext->ext.blk_addr; + +if (f2fs_set_bit (offset, i_ext->map)) + i_ext->fail =1 ; +else + i_ext->len--; + } +} +/* start with valid nid and blkaddr */ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, enum FILE_TYPE ftype, struct f2fs_node *node_blk,
@@ -522,6 +543,7 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid,enum NODE_TYPE ntype;u32 i_links =le32_to_cpu (node_blk->i.i_links);u64 i_blocks =le64_to_cpu (node_blk->i.i_blocks); +struct extent_info i_extent;unsigned int idx =0 ;int need_fix =0 ;int ret;
@@ -619,16 +641,28 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, } } + i_extent.ext = node_blk->i.i_ext; + i_extent.len =le32_to_cpu (i_extent.ext.len); + i_extent.fail =0 ; +if (i_extent.len) { +/* max 126KB */ + i_extent.map =calloc (i_extent.len,1 ); +ASSERT (i_extent.map !=NULL ); + } +/* check data blocks in inode */ for (idx =0 ; idx <ADDRS_PER_INODE (&node_blk->i); idx++) { -if (le32_to_cpu (node_blk->i.i_addr[idx]) !=0 ) { +block_t blkaddr =le32_to_cpu (node_blk->i.i_addr[idx]); + +if (blkaddr !=0 ) { ret =fsck_chk_data_blk (sbi, -le32_to_cpu (node_blk->i.i_addr[idx]), + blkaddr, &child, (i_blocks == *blk_cnt), ftype, nid, idx, ni->version,file_is_encrypt (node_blk->i.i_advise));if (!ret) { *blk_cnt = *blk_cnt +1 ; +update_i_extent (&i_extent, blkaddr); }else if (config.fix_on) { node_blk->i.i_addr[idx] =0 ; need_fix =1 ;
@@ -639,6 +673,8 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid,/* check node blocks in inode */ for (idx =0 ; idx <5 ; idx++) { +block_t blkaddr =le32_to_cpu (node_blk->i.i_nid[idx]); +if (idx ==0 || idx ==1 ) ntype =TYPE_DIRECT_NODE ;else if (idx ==2 || idx ==3 )
@@ -648,10 +684,11 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid,else ASSERT (0 ); -if (le32_to_cpu (node_blk->i.i_nid[idx]) !=0 ) { +if (blkaddr !=0 ) { ret =fsck_chk_node_blk (sbi, &node_blk->i, -le32_to_cpu (node_blk->i.i_nid[idx]), -NULL , ftype, ntype, blk_cnt, &child); + blkaddr, +NULL , ftype, ntype, blk_cnt, &child, + &i_extent);if (!ret) { *blk_cnt = *blk_cnt +1 ; }else if (config.fix_on) {
@@ -661,6 +698,12 @@ void fsck_chk_inode_blk(struct f2fs_sb_info *sbi, u32 nid, } } } +if (i_extent.len || i_extent.fail) { +ASSERT_MSG ("ino: 0x%x has wrong ext: untouched=%d, overlap=%d" , + nid, i_extent.len, i_extent.fail); +if (config.fix_on) + need_fix =1 ; + } check:if (i_blocks != *blk_cnt) { ASSERT_MSG("ino: 0x%x has i_blocks: %08"PRIx64", "
@@ -729,21 +772,25 @@ skip_blkcnt_fix: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 child_info *child,struct node_info *ni) +u32 *blk_cnt,struct child_info *child,struct node_info *ni, +struct extent_info *i_ext) {int idx, ret;int need_fix =0 ;for (idx =0 ; idx <ADDRS_PER_BLOCK ; idx++) { -if (le32_to_cpu (node_blk->dn.addr[idx]) ==0x0 ) +block_t blkaddr =le32_to_cpu (node_blk->dn.addr[idx]); + +if (blkaddr ==0x0 )continue ; ret =fsck_chk_data_blk (sbi, -le32_to_cpu (node_blk->dn.addr[idx]), - child,le64_to_cpu (inode->i_blocks) == *blk_cnt, ftype, + blkaddr, child, +le64_to_cpu (inode->i_blocks) == *blk_cnt, ftype, nid, idx, ni->version,file_is_encrypt (inode->i_advise));if (!ret) { *blk_cnt = *blk_cnt +1 ; +update_i_extent (i_ext, blkaddr); }else if (config.fix_on) { node_blk->dn.addr[idx] =0 ; need_fix =1 ;
@@ -759,7 +806,7 @@ int fsck_chk_dnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,int fsck_chk_idnode_blk (struct f2fs_sb_info *sbi,struct f2fs_inode *inode,enum FILE_TYPE ftype,struct f2fs_node *node_blk,u32 *blk_cnt, -struct child_info *child) +struct child_info *child,struct extent_info *i_ext) {int ret;int i =0 ;
@@ -769,7 +816,8 @@ int fsck_chk_idnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,continue ; ret =fsck_chk_node_blk (sbi, inode,le32_to_cpu (node_blk->in.nid[i]),NULL , - ftype,TYPE_DIRECT_NODE , blk_cnt, child); + ftype,TYPE_DIRECT_NODE , blk_cnt, child, + i_ext);if (!ret) *blk_cnt = *blk_cnt +1 ;else if (ret == -EINVAL )
@@ -780,7 +828,7 @@ int fsck_chk_idnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,int fsck_chk_didnode_blk (struct f2fs_sb_info *sbi,struct f2fs_inode *inode,enum FILE_TYPE ftype,struct f2fs_node *node_blk,u32 *blk_cnt, -struct child_info *child) +struct child_info *child,struct extent_info *i_ext) {int i =0 ;int ret =0 ;
@@ -790,7 +838,8 @@ int fsck_chk_didnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,continue ; ret =fsck_chk_node_blk (sbi, inode,le32_to_cpu (node_blk->in.nid[i]),NULL , - ftype,TYPE_INDIRECT_NODE , blk_cnt, child); + ftype,TYPE_INDIRECT_NODE , blk_cnt, child, + i_ext);if (!ret) *blk_cnt = *blk_cnt +1 ;else if (ret == -EINVAL )
@@ -999,7 +1048,7 @@ static int __chk_dentries(struct f2fs_sb_info *sbi, struct child_info *child, blk_cnt =1 ; ret =fsck_chk_node_blk (sbi,NULL ,le32_to_cpu (dentry[i].ino), name, - ftype,TYPE_INODE , &blk_cnt,NULL ); + ftype,TYPE_INODE , &blk_cnt,NULL ,NULL );if (ret && config.fix_on) {int j;
@@ -1165,7 +1214,7 @@ void fsck_chk_orphan_node(struct f2fs_sb_info *sbi) blk_cnt =1 ; ret =fsck_chk_node_blk (sbi,NULL , ino,NULL ,F2FS_FT_ORPHAN ,TYPE_INODE , &blk_cnt, -NULL ); +NULL ,NULL );if (!ret) new_blk->ino[new_entry_count++] = orphan_blk->ino[j];
fsck/fsck.h +13 -4
@@ -25,6 +25,13 @@ struct child_info {u8 dots; }; +struct extent_info { +struct f2fs_extent ext; +char *map; +int len; +int fail; +}; +struct f2fs_fsck {struct f2fs_sb_info sbi;
@@ -88,16 +95,18 @@ enum seg_type {extern void fsck_chk_orphan_node (struct f2fs_sb_info *);extern int fsck_chk_node_blk (struct f2fs_sb_info *,struct f2fs_inode *,u32 ,u8 *,enum FILE_TYPE ,enum NODE_TYPE ,u32 *, -struct child_info *); +struct child_info *,struct extent_info *);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 child_info *,struct node_info *); +struct child_info *,struct node_info *,struct extent_info *);extern int fsck_chk_idnode_blk (struct f2fs_sb_info *,struct f2fs_inode *, -enum FILE_TYPE ,struct f2fs_node *,u32 *,struct child_info *); +enum FILE_TYPE ,struct f2fs_node *,u32 *,struct child_info *, +struct extent_info *);extern int fsck_chk_didnode_blk (struct f2fs_sb_info *,struct f2fs_inode *, -enum FILE_TYPE ,struct f2fs_node *,u32 *,struct child_info *); +enum FILE_TYPE ,struct f2fs_node *,u32 *,struct child_info *, +struct extent_info *);extern int fsck_chk_data_blk (struct f2fs_sb_info *sbi,u32 ,struct child_info *,int ,enum FILE_TYPE ,u32 ,u16 ,u8 ,int ); extern int fsck_chk_dentry_blk(struct f2fs_sb_info *, u32, struct child_info *,
fsck/main.c +1 -1
@@ -155,7 +155,7 @@ static void do_fsck(struct f2fs_sb_info *sbi)/* Traverse all block recursively from root inode */ blk_cnt =1 ;fsck_chk_node_blk (sbi,NULL , sbi->root_ino_num, (u8 *)"/" , -F2FS_FT_DIR ,TYPE_INODE , &blk_cnt,NULL ); +F2FS_FT_DIR ,TYPE_INODE , &blk_cnt,NULL ,NULL );fsck_verify (sbi);fsck_free (sbi); }
Signature · 4 lines
2.5.4 (Apple Git-61) ------------------------------------------------------------------------------
PATCH 3/6 mkfs.f2fs: export get_best_overprovision
In reply to Jaegeuk KimThis patch exports get_best_overprovision() function.
--- include/f2fs_fs.h | 28 ++++++++++++++++++++++++++++ mkfs/f2fs_format.c | 30 +----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-)
include/f2fs_fs.h +28 -0
@@ -886,4 +886,32 @@ extern struct f2fs_configuration config;#define ZONE_ALIGN (blks) ALIGN(blks, config.blks_per_seg * \ config.segs_per_zone) +static inline double get_best_overprovision (struct f2fs_super_block *sb) +{ +double reserved, ovp, candidate, end, diff, space; +double max_ovp =0 , max_space =0 ; + +if (get_sb (segment_count_main) <256 ) { + candidate =10 ; + end =95 ; + diff =5 ; + }else { + candidate =0.01 ; + end =10 ; + diff =0.01 ; + } + +for (; candidate <= end; candidate += diff) { + reserved = (2 * (100 / candidate +1 ) +6 ) * +get_sb (segs_per_sec); + ovp = (get_sb (segment_count_main) - reserved) * candidate /100 ; + space =get_sb (segment_count_main) - reserved - ovp; +if (max_space < space) { + max_space = space; + max_ovp = candidate; + } + } +return max_ovp; +} +#endif /*__F2FS_FS_H */
mkfs/f2fs_format.c +1 -29
@@ -117,34 +117,6 @@ next:free (config.extension_list); } -static double get_best_overprovision (void ) -{ -double reserved, ovp, candidate, end, diff, space; -double max_ovp =0 , max_space =0 ; - -if (get_sb (segment_count_main) <256 ) { - candidate =10 ; - end =95 ; - diff =5 ; - }else { - candidate =0.01 ; - end =10 ; - diff =0.01 ; - } - -for (; candidate <= end; candidate += diff) { - reserved = (2 * (100 / candidate +1 ) +6 ) * -get_sb (segs_per_sec); - ovp = (get_sb (segment_count_main) - reserved) * candidate /100 ; - space =get_sb (segment_count_main) - reserved - ovp; -if (max_space < space) { - max_space = space; - max_ovp = candidate; - } - } -return max_ovp; -} -static int f2fs_prepare_super_block (void ) {u_int32_t blk_size_bytes;
@@ -302,7 +274,7 @@ static int f2fs_prepare_super_block(void)/* Let's determine the best reserved and overprovisioned space */ if (config.overprovision ==0 ) - config.overprovision =get_best_overprovision (); + config.overprovision =get_best_overprovision (sb); config.reserved_segments = (2 * (100 / config.overprovision +1 ) +6 )
Signature · 4 lines
2.5.4 (Apple Git-61) ------------------------------------------------------------------------------
PATCH 4/6 f2fs-tools: export print_raw_sb_info
In reply to Jaegeuk KimThis patch exports print_raw_sb_info().
--- fsck/fsck.h | 2 ++ fsck/mount.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-)
fsck/fsck.h +2 -0
@@ -132,6 +132,8 @@ 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 *); +extern void print_raw_sb_info (struct f2fs_super_block *); +/* dump.c */ struct dump_option {nid_t nid;
fsck/mount.c +2 -4
@@ -99,10 +99,8 @@ void print_node_info(struct f2fs_node *node_block) } } -void print_raw_sb_info (struct f2fs_sb_info *sbi) +void print_raw_sb_info (struct f2fs_super_block *sb) { -struct f2fs_super_block *sb =F2FS_RAW_SUPER (sbi); -if (!config.dbg_lv)return ;
@@ -1292,7 +1290,7 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)return -1 ; } -print_raw_sb_info (sbi); +print_raw_sb_info (F2FS_RAW_SUPER (sbi));init_sb_info (sbi);
Signature · 4 lines
2.5.4 (Apple Git-61) ------------------------------------------------------------------------------
PATCH 5/6 fsck.f2fs: LFS alloc_type must have free segment after blkoff
In reply to Jaegeuk KimThis patch checks alloc_type of current segment type. If it is LFS, the last of segment should have no valid block.
--- fsck/f2fs.h | 16 ++++++++++ fsck/fsck.c | 15 +++++++++- fsck/fsck.h | 4 +++ fsck/mount.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 1 deletion(-)
fsck/f2fs.h +16 -0
@@ -354,6 +354,22 @@ static inline bool IS_VALID_BLK_ADDR(struct f2fs_sb_info *sbi, u32 addr)return 1 ; } +static inline int IS_CUR_SEGNO (struct f2fs_sb_info *sbi,u32 segno,int type) +{ +int i; + +for (i =0 ; i <NO_CHECK_TYPE ; i++) { +struct curseg_info *curseg =CURSEG_I (sbi, i); + +if (type == i) +continue ; + +if (segno == curseg->segno) +return 1 ; + } +return 0 ; +} +static inline u64 BLKOFF_FROM_MAIN (struct f2fs_sb_info *sbi,u64 blk_addr) {ASSERT (blk_addr >=SM_I (sbi)->main_blkaddr);
fsck/fsck.c +14 -1
@@ -1368,13 +1368,24 @@ int check_curseg_offset(struct f2fs_sb_info *sbi)for (i =0 ; i <NO_CHECK_TYPE ; i++) {struct curseg_info *curseg =CURSEG_I (sbi, i);struct seg_entry *se; +int j, nblocks; se =get_seg_entry (sbi, curseg->segno);if (f2fs_test_bit (curseg->next_blkoff, - (const char *)se->cur_valid_map) ==1 ) { + (const char *)se->cur_valid_map)) {ASSERT_MSG ("Next block offset is not free, type:%d" , i);return -EINVAL ; } +if (curseg->alloc_type ==SSR ) +return 0 ; + + nblocks = sbi->blocks_per_seg; +for (j = curseg->next_blkoff +1 ; j < nblocks; j++) { +if (f2fs_test_bit (j, (const char *)se->cur_valid_map)) { +ASSERT_MSG ("LFS must have free section:%d" , i); +return -EINVAL ; + } + } }return 0 ; }
@@ -1528,6 +1539,8 @@ int fsck_verify(struct f2fs_sb_info *sbi)if (force || (config.bug_on && config.fix_on && !config.ro)) {fix_hard_links (sbi);fix_nat_entries (sbi); +move_curseg_info (sbi,SM_I (sbi)->main_blkaddr); +write_curseg_info (sbi);rewrite_sit_area_bitmap (sbi);fix_checkpoint (sbi); }
fsck/fsck.h +4 -0
@@ -132,6 +132,10 @@ 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 *); +extern void move_curseg_info (struct f2fs_sb_info *,u64 ); +extern void write_curseg_info (struct f2fs_sb_info *); +extern int find_next_free_block (struct f2fs_sb_info *,u64 *,int ,int ); +extern void print_raw_sb_info (struct f2fs_super_block *);/* dump.c */
fsck/mount.c +97 -0
103 lines not on this page · raw message
Signature · 4 lines
2.5.4 (Apple Git-61) ------------------------------------------------------------------------------
PATCH 6/6 defrag.f2fs: introduce defragmentation tool
In reply to Jaegeuk KimThis tool tries to move the valid blocks ranging from blkaddr to blkaddr + len to targeted blkaddr with a direction like expand or shrink.
The option includes:
-d debug level [default:0]
-s start block address [default: main_blkaddr] -l length [default:512 (2MB)]
-t target block address [default: main_blkaddr + 2MB] -i set direction as shrink [default: expand]
For example,
# defrag.f2fs -s 0x100 -l 0x10 -t 0x4000 /dev/sdb1
This will move data blocks between 0x100 and 0x110 to the right side of 0x4000 space.
--- autogen.sh | 0 fsck/Makefile.am | 3 +- fsck/defrag.c | 101 +++++++++++++++++++ fsck/f2fs.h | 1 + fsck/fsck.h | 10 ++ fsck/main.c | 135 +++++++++++++++++++++++-- fsck/mount.c | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/f2fs_fs.h | 7 ++ 8 files changed, 538 insertions(+), 9 deletions(-) mode change 100644 => 100755 autogen.sh create mode 100644 fsck/defrag.c
autogen.sh +0 -0
fsck/Makefile.am +2 -1
@@ -3,8 +3,9 @@ AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include AM_CFLAGS = -Wall sbin_PROGRAMS = fsck.f2fs -fsck_f2fs_SOURCES = main.c fsck.c dump.c mount.c f2fs.h fsck.h $(top_srcdir)/include/f2fs_fs.h +fsck_f2fs_SOURCES = main.c fsck.c dump.c mount.c defrag.c f2fs.h fsck.h $(top_srcdir)/include/f2fs_fs.h fsck_f2fs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/libf2fs.la install-data-hook: ln -sf fsck.f2fs $(DESTDIR)/$(sbindir)/dump.f2fs + ln -sf fsck.f2fs $(DESTDIR)/$(sbindir)/defrag.f2fs
fsck/defrag.c new file +101 -0
101 lines not on this page · raw message
fsck/f2fs.h +1 -0
@@ -74,6 +74,7 @@ struct seg_entry {unsigned char type;/* segment type like CURSEG_XXX_TYPE */ unsigned char orig_type;/* segment type like CURSEG_XXX_TYPE */ unsigned long long mtime;/* modification time of the segment */ +int dirty; };struct sec_entry {
fsck/fsck.h +10 -0
@@ -121,6 +121,8 @@ extern struct seg_entry *get_seg_entry(struct f2fs_sb_info *, unsigned int);extern struct f2fs_summary_block *get_sum_block (struct f2fs_sb_info *,unsigned int ,int *);extern int get_sum_entry (struct f2fs_sb_info *,u32 ,struct f2fs_summary *); +extern void update_sum_entry (struct f2fs_sb_info *,block_t , +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 *);
@@ -132,9 +134,14 @@ 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 *); +extern void flush_journal_entries (struct f2fs_sb_info *); +extern void flush_sit_entries (struct f2fs_sb_info *);extern void move_curseg_info (struct f2fs_sb_info *,u64 );extern void write_curseg_info (struct f2fs_sb_info *);extern int find_next_free_block (struct f2fs_sb_info *,u64 *,int ,int ); +extern void write_checkpoint (struct f2fs_sb_info *); +extern void update_data_blkaddr (struct f2fs_sb_info *,nid_t ,u16 ,block_t ); +extern void update_nat_blkaddr (struct f2fs_sb_info *,nid_t ,block_t );extern void print_raw_sb_info (struct f2fs_super_block *);
@@ -153,4 +160,7 @@ extern void ssa_dump(struct f2fs_sb_info *, int, int);extern void dump_node (struct f2fs_sb_info *,nid_t );extern int dump_info_from_blkaddr (struct f2fs_sb_info *,u32 ); +/* defrag.c */ +int f2fs_defragment (struct f2fs_sb_info *,u64 ,u64 ,u64 ,int ); +#endif /* _FSCK_H_ */
fsck/main.c +127 -8
190 lines not on this page · raw message
fsck/mount.c +290 -0
314 lines not on this page · raw message
include/f2fs_fs.h +7 -0
@@ -220,6 +220,7 @@ static inline uint64_t bswap_64(uint64_t val)enum f2fs_config_func {FSCK ,DUMP , +DEFRAG , };struct f2fs_configuration {
@@ -252,6 +253,12 @@ struct f2fs_configuration {int auto_fix;int ro;__le32 feature;/* defined features */ + +/* defragmentation parameters */ +int defrag_shrink; +u_int64_t defrag_start; +u_int64_t defrag_len; +u_int64_t defrag_target; } __attribute__((packed));#ifdef CONFIG_64BIT
Signature · 4 lines
2.5.4 (Apple Git-61) ------------------------------------------------------------------------------