f2fs_io: add mmap read operation
PATCH 1/3 f2fs_io: add mmap read operation
This patch adds an option, mmap, when reading data.
Signed-off-by Jaegeuk Kim <[email protected]>
--- tools/f2fs_io/f2fs_io.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
tools/f2fs_io/f2fs_io.c +18 -1
@@ -489,15 +489,18 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd)"IO can be\n" \" buffered : buffered IO\n" \" dio : direct IO\n" \ +" mmap : mmap IO\n" \ static void do_read(int argc, char **argv, const struct cmd_desc *cmd) {u64 buf_size =0 , ret =0 , read_cnt =0 ;u64 offset;char *buf =NULL ; +char *data;char *print_buf =NULL ;unsigned bs, count, i, print_bytes;int flags =0 ; +int do_mmap =0 ;int fd;if (argc !=7 ) {
@@ -518,6 +521,8 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd) count =atoi (argv[3 ]);if (!strcmp (argv[4 ],"dio" )) flags |=O_DIRECT ; +else if (!strcmp (argv[4 ],"mmap" )) + do_mmap =1 ;else if (strcmp (argv[4 ],"buffered" ))die ("Wrong IO type" );
@@ -529,8 +534,20 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd) fd =xopen (argv[6 ],O_RDONLY | flags,0 ); +if (do_mmap) { + data =mmap (NULL , count * buf_size,PROT_READ , +MAP_SHARED , fd, offset); +if (data ==MAP_FAILED ) +die ("Mmap failed" ); + } +for (i =0 ; i < count; i++) { - ret =pread (fd, buf, buf_size, offset + buf_size * i); +if (do_mmap) { +memcpy (buf, data + offset + buf_size * i, buf_size); + ret = buf_size; + }else { + ret =pread (fd, buf, buf_size, offset + buf_size * i); + }if (ret != buf_size)break ;
Signature · 8 lines
2.28.0.rc0.105.gf9edc3c819-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 2/3 mkfs.f2fs: should initialize sparse file in Windows
Otherwise it fails to format in Windows.
Signed-off-by Jaegeuk Kim <[email protected]>
--- lib/libf2fs.c | 2 ++ 1 file changed, 2 insertions(+)
lib/libf2fs.c +2 -0
@@ -1158,6 +1158,8 @@ int get_device_info(int i) c.sectors_per_blk =F2FS_BLKSIZE / c.sector_size; c.total_sectors += dev->total_sectors; +if (c.sparse_mode &&f2fs_init_sparse_file ()) +return -1 ; return 0; }#endif
Signature · 8 lines
2.28.0.rc0.105.gf9edc3c819-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 3/3 mkfs.f2fs: add casefolding and project quota config
In reply to Jaegeuk KimThis can be used for Android build support.
Signed-off-by Jaegeuk Kim <[email protected]>
--- include/f2fs_fs.h | 1 + lib/libf2fs.c | 11 +++++++++++ mkfs/f2fs_format_main.c | 14 ++++++++++++++ 3 files changed, 26 insertions(+)
include/f2fs_fs.h +1 -0
@@ -1563,6 +1563,7 @@ extern const struct f2fs_nls_table *f2fs_load_nls_table(int encoding);#define F2FS_ENC_UTF8_12_0 1extern int f2fs_str2encoding (const char *string); +extern char *f2fs_encoding2str (const int encoding);extern int f2fs_get_encoding_flags (int encoding);extern int f2fs_str2encoding_flags (char **param,__u16 *flags);
lib/libf2fs.c +11 -0
@@ -1306,6 +1306,17 @@ int f2fs_str2encoding(const char *string)return -EINVAL ; } +char *f2fs_encoding2str (const int encoding) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (f2fs_encoding_map); i++) +if (f2fs_encoding_map[i].encoding_magic == encoding) +return f2fs_encoding_map[i].name; + +return NULL ; +} +int f2fs_get_encoding_flags (int encoding) {int i;
mkfs/f2fs_format_main.c +14 -0
@@ -90,6 +90,12 @@ static void f2fs_show_info()if (c.defset ==CONF_ANDROID )MSG (0 ,"Info: Set conf for android\n" ); + +if (c.feature &le32_to_cpu (F2FS_FEATURE_CASEFOLD )) +MSG (0 ,"Info: Enable %s with casefolding\n" , +f2fs_encoding2str (c.s_encoding)); +if (c.feature &le32_to_cpu (F2FS_FEATURE_PRJQUOTA )) +MSG (0 ,"Info: Enable Project quota\n" ); }static void add_default_options (void )
@@ -106,6 +112,14 @@ static void add_default_options(void) c.root_uid = c.root_gid =0 ;break ; } +#ifdef CONF_CASEFOLD + c.s_encoding =F2FS_ENC_UTF8_12_1 ; + c.feature |=cpu_to_le32 (F2FS_FEATURE_CASEFOLD ); +#endif +#ifdef CONF_PROJID + c.feature |=cpu_to_le32 (F2FS_FEATURE_PRJQUOTA ); + c.feature |=cpu_to_le32 (F2FS_FEATURE_EXTRA_ATTR ); +#endif }static void f2fs_parse_options (int argc,char *argv[])
Signature · 8 lines
2.28.0.rc0.105.gf9edc3c819-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel