dump.f2fs: add -M to get block map
PATCH 1/3 dump.f2fs: add -M to get block map
Signed-off-by Jaegeuk Kim <[email protected]>
--- fsck/dump.c | 38 +++++++++++++++++++++++++++++++++++++- fsck/main.c | 6 +++++- man/dump.f2fs.8 | 7 +++++++ 3 files changed, 49 insertions(+), 2 deletions(-)
fsck/dump.c +37 -1
@@ -23,6 +23,9 @@#define BUF_SZ 80 +/* current extent info */ +struct extent_info dump_extent = {0 ,0 ,0 }; +const char *seg_type_name[SEG_TYPE_MAX +1 ] = {"SEG_TYPE_DATA" ,"SEG_TYPE_CUR_DATA" ,
@@ -227,6 +230,21 @@ void ssa_dump(struct f2fs_sb_info *sbi, int start_ssa, int end_ssa)close (fd); } +static void print_extent (bool last) +{ +if (dump_extent.len ==1 ) { +printf (" %d" , dump_extent.blk); + dump_extent.len =0 ; + }else { +printf (" %d-%d" , + dump_extent.blk, + dump_extent.blk + dump_extent.len -1 ); + dump_extent.len =0 ; + } +if (last) +printf ("\n" ); +} +static void dump_data_blk (struct f2fs_sb_info *sbi,__u64 offset,u32 blkaddr) {char buf[F2FS_BLKSIZE ];
@@ -237,8 +255,19 @@ static void dump_data_blk(struct f2fs_sb_info *sbi, __u64 offset, u32 blkaddr)/* get data */ if (blkaddr ==NEW_ADDR || !IS_VALID_BLK_ADDR (sbi, blkaddr)) {memset (buf,0 ,F2FS_BLKSIZE ); + }else if (c.show_file_map) { +if (dump_extent.len ==0 ) { + dump_extent.blk = blkaddr; + dump_extent.len =1 ; + }else if (dump_extent.blk + dump_extent.len == blkaddr) { + dump_extent.len++; + }else { +print_extent (false); + } +return ; }else {int ret; + ret =dev_read_block (buf, blkaddr);ASSERT (ret >=0 ); }
@@ -404,6 +433,8 @@ static void dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,else ASSERT (0 ); } +/* last block in extent cache */ +print_extent (true);dump_xattr (sbi, node_blk); }
@@ -433,6 +464,10 @@ static void dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,if (force) goto dump; +/* dump file's data */ +if (c.show_file_map) +return dump_inode_blk (sbi, ni->ino, node_blk); +printf ("Do you want to dump this file into ./lost_found/? [Y/N] " ); ret =scanf ("%s" , ans);ASSERT (ret >=0 );
@@ -505,7 +540,8 @@ void dump_node(struct f2fs_sb_info *sbi, nid_t nid, int force)if (le32_to_cpu (node_blk->footer.ino) == ni.ino &&le32_to_cpu (node_blk->footer.nid) == ni.nid) { -print_node_info (sbi, node_blk, force); +if (!c.show_file_map) +print_node_info (sbi, node_blk, force);if (ni.ino == ni.nid)dump_file (sbi, &ni, node_blk, force);
fsck/main.c +5 -1
@@ -93,6 +93,7 @@ void dump_usage()MSG (0 ," -d debug level [default:0]\n" );MSG (0 ," -i inode no (hex)\n" );MSG (0 ," -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n" ); +MSG (0 ," -M show a block map\n" );MSG (0 ," -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n" );MSG (0 ," -S sparse_mode\n" );MSG (0 ," -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n" );
@@ -376,7 +377,7 @@ void f2fs_parse_options(int argc, char *argv[]) } }else if (!strcmp ("dump.f2fs" , prog)) {#ifdef WITH_DUMP -const char *option_string ="d:i:n:s:Sa:b:V" ; +const char *option_string ="d:i:n:Ms:Sa:b:V" ;static struct dump_option dump_opt = { .nid =0 ,/* default root ino */ .start_nat = -1,
@@ -423,6 +424,9 @@ void f2fs_parse_options(int argc, char *argv[]) &dump_opt.start_nat, &dump_opt.end_nat);break ; +case 'M' : + c.show_file_map =1 ; +break ;case 's' : ret = sscanf(optarg, "%d~%d", &dump_opt.start_sit,
man/dump.f2fs.8 +7 -0
@@ -14,6 +14,10 @@ dump.f2fs \- retrieve directory and file entries from an F2FS-formated image .I NAT range ] [ +.B \-M +.I Block map +] +[ .B \-s .I SIT range ]
@@ -51,6 +55,9 @@ Specify an inode number to dump out. .BI \-n " NAT range" Specify a range presented by nids to dump NAT entries. .TP +.BI \-M " Block map" +Show all the allocated block addresses given inode number. +.TP .BI \-s " SIT range" Specify a range presented by segment numbers to dump SIT entries. .TP
Signature · 8 lines
2.32.0.272.g935e593368-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 2/3 fsck.f2fs: add -M to get file map
This option shows all the file names in the disk.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fsck/dump.c | 18 +++++++------ fsck/fsck.c | 64 +++++++++++++++++++++++++++++++++++++++++------ fsck/fsck.h | 15 ++++++++--- fsck/main.c | 9 +++++-- fsck/mount.c | 3 +++ include/f2fs_fs.h | 5 ++-- man/fsck.f2fs.8 | 7 ++++++ 7 files changed, 100 insertions(+), 21 deletions(-)
fsck/dump.c +11 -7
@@ -400,7 +400,7 @@ static void dump_xattr(struct f2fs_sb_info *UNUSED(sbi), }#endif -static void dump_inode_blk (struct f2fs_sb_info *sbi,u32 nid, +static int dump_inode_blk (struct f2fs_sb_info *sbi,u32 nid,struct f2fs_node *node_blk) {u32 i =0 ;
@@ -411,7 +411,7 @@ static void dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,/* recover from inline data */ dev_write_dump (((unsigned char *)node_blk) +INLINE_DATA_OFFSET ,0 ,MAX_INLINE_DATA (node_blk)); -return ; +return -1 ; }/* check data blocks in inode */
@@ -437,9 +437,10 @@ static void dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,print_extent (true);dump_xattr (sbi, node_blk); +return 0 ; } -static void dump_file (struct f2fs_sb_info *sbi,struct node_info *ni, +static int dump_file (struct f2fs_sb_info *sbi,struct node_info *ni,struct f2fs_node *node_blk,int force) {struct f2fs_inode *inode = &node_blk->i;
@@ -453,13 +454,13 @@ static void dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,if (is_encrypted) {MSG (force,"File is encrypted\n" ); -return ; +return -1 ; }if ((!S_ISREG (imode) && !S_ISLNK (imode)) || namelen ==0 || namelen >F2FS_NAME_LEN ) {MSG (force,"Not a regular file or wrong name info\n\n" ); -return ; +return -1 ; }if (force) goto dump;
@@ -494,6 +495,7 @@ dump:close (c.dump_fd); } +return 0 ; }static bool is_sit_bitmap_set (struct f2fs_sb_info *sbi,u32 blk_addr)
@@ -508,10 +510,11 @@ static bool is_sit_bitmap_set(struct f2fs_sb_info *sbi, u32 blk_addr) (const char *)se->cur_valid_map) != 0; } -void dump_node (struct f2fs_sb_info *sbi,nid_t nid,int force) +int dump_node (struct f2fs_sb_info *sbi,nid_t nid,int force) {struct node_info ni;struct f2fs_node *node_blk; +int ret =0 ;get_node_info (sbi, nid, &ni);
@@ -544,13 +547,14 @@ void dump_node(struct f2fs_sb_info *sbi, nid_t nid, int force)print_node_info (sbi, node_blk, force);if (ni.ino == ni.nid) -dump_file (sbi, &ni, node_blk, force); + ret =dump_file (sbi, &ni, node_blk, force); }else {print_node_info (sbi, node_blk, force);MSG (force,"Invalid (i)node block\n\n" ); } out:free (node_blk); +return ret; }static void dump_node_from_blkaddr (struct f2fs_sb_info *sbi,u32 blk_addr)
fsck/fsck.c +57 -7
150 lines not on this page · raw message
fsck/fsck.h +12 -3
@@ -72,13 +72,20 @@ struct child_info {u32 pgofs;u8 dots;u8 dir_level; -u32 p_ino;/*parent ino*/ -u32 pp_ino;/*parent parent ino*/ +u32 p_ino;/* parent ino */ +char p_name[F2FS_NAME_LEN ];/* parent name */ +u32 pp_ino;/* parent parent ino*/ struct extent_info ei;u32 last_blk;u32 i_namelen;/* dentry namelen */ }; +struct f2fs_dentry { +char name[F2FS_NAME_LEN ]; +int depth; +struct f2fs_dentry *next; +}; +struct f2fs_fsck {struct f2fs_sb_info sbi;
@@ -110,6 +117,8 @@ struct f2fs_fsck {u32 nr_nat_entries;u32 dentry_depth; +struct f2fs_dentry *dentry; +struct f2fs_dentry *dentry_end;struct f2fs_nat_entry *entries;u32 nat_valid_inode_cnt;
@@ -253,7 +262,7 @@ struct dump_option {extern void nat_dump (struct f2fs_sb_info *,nid_t ,nid_t );extern void sit_dump (struct f2fs_sb_info *,unsigned int ,unsigned int );extern void ssa_dump (struct f2fs_sb_info *,int ,int ); -extern void dump_node (struct f2fs_sb_info *,nid_t ,int ); +extern int dump_node (struct f2fs_sb_info *,nid_t ,int );extern int dump_info_from_blkaddr (struct f2fs_sb_info *,u32 );extern unsigned int start_bidx_of_node (unsigned int ,struct f2fs_node *);
fsck/main.c +7 -2
@@ -72,6 +72,7 @@ void fsck_usage()MSG (0 ," -f check/fix entire partition\n" );MSG (0 ," -g add default options\n" );MSG (0 ," -l show superblock/checkpoint\n" ); +MSG (0 ," -M show a file map\n" );MSG (0 ," -O feature1[feature2,feature3,...] e.g. \"encrypt\"\n" );MSG (0 ," -p preen mode [default:0 the same as -a [0|1]]\n" );MSG (0 ," -S sparse_mode\n" );
@@ -228,7 +229,7 @@ void f2fs_parse_options(int argc, char *argv[]) }if (!strcmp ("fsck.f2fs" , prog)) { -const char *option_string =":aC:c:m:d:fg:lO:p:q:StyV" ; +const char *option_string =":aC:c:m:Md:fg:lO:p:q:StyV" ;int opt =0 , val;char *token;struct option long_opt[] = {
@@ -278,6 +279,9 @@ void f2fs_parse_options(int argc, char *argv[])case 'l' : c.layout =1 ;break ; +case 'M' : + c.show_file_map =1 ; +break ;case 'O' :if (parse_feature (feature_table, optarg))fsck_usage ();
@@ -1212,7 +1216,8 @@ retry:if (c.func ==SLOAD ) c.compress.filter_ops->destroy (); -printf ("\nDone: %lf secs\n" , (get_boottime_ns () - start) /1000000000.0 ); +if (!c.show_file_map) +printf ("\nDone: %lf secs\n" , (get_boottime_ns () - start) /1000000000.0 );return ret; out_err:
fsck/mount.c +3 -0
@@ -489,6 +489,9 @@ printout:void print_cp_state (u32 flag) { +if (c.show_file_map) +return ; +MSG (0 ,"Info: checkpoint state = %x : " , flag);if (flag &CP_QUOTA_NEED_FSCK_FLAG )MSG (0 ,"%s" ," quota_need_fsck" );
include/f2fs_fs.h +3 -2
@@ -240,14 +240,14 @@ static inline uint64_t bswap_64(uint64_t val)#define MSG (n, fmt, ...) \ do { \ - if (c.dbg_lv >= n && !c.layout) { \ + if (c.dbg_lv >= n && !c.layout && !c.show_file_map) { \ printf(fmt, ##__VA_ARGS__); \ } \ } while (0)#define DBG (n, fmt, ...) \ do { \ - if (c.dbg_lv >= n && !c.layout) { \ + if (c.dbg_lv >= n && !c.layout && !c.show_file_map) { \ printf("[%s:%4d] " fmt, \ __func__, __LINE__, ##__VA_ARGS__); \ } \
@@ -491,6 +491,7 @@ struct f2fs_configuration {int alloc_failed;int auto_fix;int layout; +int show_file_map;int quota_fix;int preen_mode;int ro;
man/fsck.f2fs.8 +7 -0
@@ -14,6 +14,10 @@ fsck.f2fs \- check a Linux F2FS file system .I enable force fix ] [ +.B \-M +.I show file map +] +[ .B \-p .I enable preen mode ]
@@ -44,6 +48,9 @@ module. It is disabled by default. .BI \-f " enable force fix" Enable to fix all the inconsistency in the partition. .TP +.BI \-M " show files map" +Enable to show all the filenames and inode numbers stored in the image +.TP .BI \-p " enable preen mode" Same as "-a" to support general fsck convention. .TP
Signature · 8 lines
2.32.0.272.g935e593368-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 3/3 mkfs.f2fs: remove android features for RO
In reply to Jaegeuk KimWe don't need to enable all android features for RO.
Signed-off-by Jaegeuk Kim <[email protected]>
--- mkfs/f2fs_format_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
mkfs/f2fs_format_main.c +7 -2
@@ -110,11 +110,16 @@ static void add_default_options(void)/* -d1 -f -O encrypt -O quota -O verity -w 4096 -R 0:0 */ c.dbg_lv =1 ; force_overwrite =1 ; + c.wanted_sector_size =4096 ; + c.root_uid = c.root_gid =0 ; + +/* RO doesn't need any other features */ +if (c.feature &cpu_to_le32 (F2FS_FEATURE_RO )) +return ; + c.feature |=cpu_to_le32 (F2FS_FEATURE_ENCRYPT ); c.feature |=cpu_to_le32 (F2FS_FEATURE_QUOTA_INO ); c.feature |=cpu_to_le32 (F2FS_FEATURE_VERITY ); - c.wanted_sector_size =4096 ; - c.root_uid = c.root_gid =0 ;break ; }#ifdef CONF_CASEFOLD
Signature · 8 lines
2.32.0.272.g935e593368-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel