openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 01:59:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build: clean up the base functions

Browse Source 
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Jaegeuk Kim 2013-02-12 11:03:24 +09:00
parent e69e437850
commit 5043dffbd1
3 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/f2fs_fs.h
View File

@ -596,10 +596,10 @@ void f2fs_init_configuration(struct f2fs_configuration *);
int f2fs_dev_is_mounted(struct f2fs_configuration *);
int f2fs_get_device_info(struct f2fs_configuration *);
int dev_read(int, void *, __u64, size_t);
int dev_write(int, void *, __u64, size_t);
int dev_read(void *, __u64, size_t);
int dev_write(void *, __u64, size_t);
int dev_read_block(int, void *, __u64);
int dev_read_blocks(int, void *, __u64, __u32 );
int dev_read_block(void *, __u64);
int dev_read_blocks(void *, __u64, __u32 );
#endif //__F2FS_FS_H__
#endif /*__F2FS_FS_H */

35
lib/libf2fs.c
View File

@ -106,6 +106,21 @@ u_int32_t f2fs_cal_crc32(u_int32_t crc, void *buf, int len)
return crc;
}
int f2fs_crc_valid(u_int32_t blk_crc, void *buf, int len)
{
u_int32_t cal_crc = 0;
cal_crc = f2fs_cal_crc32(F2FS_SUPER_MAGIC, buf, len);
if (cal_crc != blk_crc) {
DBG(0,"CRC validation failed: cal_crc = %u \
blk_crc = %u buff_size = 0x%x",
cal_crc, blk_crc, len);
return -1;
}
return 0;
}
/*
* device information
*/
@ -218,30 +233,30 @@ int f2fs_get_device_info(struct f2fs_configuration *c)
/*
* IO interfaces
*/
int dev_read(int fd, void *buf, __u64 offset, size_t len)
int dev_read(void *buf, __u64 offset, size_t len)
{
if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0)
if (lseek64(config.fd, (off64_t)offset, SEEK_SET) < 0)
return -1;
if (read(fd, buf, len) < 0)
if (read(config.fd, buf, len) < 0)
return -1;
return 0;
}
int dev_write(int fd, void *buf, __u64 offset, size_t len)
int dev_write(void *buf, __u64 offset, size_t len)
{
if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0)
if (lseek64(config.fd, (off64_t)offset, SEEK_SET) < 0)
return -1;
if (write(fd, buf, len) < 0)
if (write(config.fd, buf, len) < 0)
return -1;
return 0;
}
int dev_read_block(int fd, void *buf, __u64 blk_addr)
int dev_read_block(void *buf, __u64 blk_addr)
{
return dev_read(fd, buf, blk_addr * F2FS_BLKSIZE, F2FS_BLKSIZE);
return dev_read(buf, blk_addr * F2FS_BLKSIZE, F2FS_BLKSIZE);
}
int dev_read_blocks(int fd, void *buf, __u64 addr, __u32 nr_blks)
int dev_read_blocks(void *buf, __u64 addr, __u32 nr_blks)
{
return dev_read(fd, buf, addr * F2FS_BLKSIZE, nr_blks * F2FS_BLKSIZE);
return dev_read(buf, addr * F2FS_BLKSIZE, nr_blks * F2FS_BLKSIZE);
}

37
mkfs/f2fs_format.c
View File

@ -451,7 +451,7 @@ static int f2fs_init_sit_area(void)
for (index = 0;
index < (le32_to_cpu(super_block.segment_count_sit) / 2);
index++) {
if (dev_write(config.fd, zero_buf, sit_seg_addr, seg_size)) {
if (dev_write(zero_buf, sit_seg_addr, seg_size)) {
MSG(1, "\tError: While zeroing out the sit area \
on disk!!!\n");
return -1;
@ -486,7 +486,7 @@ static int f2fs_init_nat_area(void)
for (index = 0;
index < (le32_to_cpu(super_block.segment_count_nat) / 2);
index++) {
if (dev_write(config.fd, nat_buf, nat_seg_addr, seg_size)) {
if (dev_write(nat_buf, nat_seg_addr, seg_size)) {
MSG(1, "\tError: While zeroing out the nat area \
on disk!!!\n");
return -1;
@ -584,7 +584,7 @@ static int f2fs_write_check_point_pack(void)
cp_seg_blk_offset = le32_to_cpu(super_block.segment0_blkaddr);
cp_seg_blk_offset *= blk_size_bytes;
if (dev_write(config.fd, ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the ckp to disk!!!\n");
return -1;
}
@ -597,7 +597,7 @@ static int f2fs_write_check_point_pack(void)
sum->entries[0].ofs_in_node = 0;
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the sum_blk to disk!!!\n");
return -1;
}
@ -607,7 +607,7 @@ static int f2fs_write_check_point_pack(void)
SET_SUM_TYPE((&sum->footer), SUM_TYPE_DATA);
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the sum_blk to disk!!!\n");
return -1;
}
@ -636,7 +636,7 @@ static int f2fs_write_check_point_pack(void)
sum->sit_j.entries[5].se.vblocks = cpu_to_le16((CURSEG_COLD_DATA << 10));
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the sum_blk to disk!!!\n");
return -1;
}
@ -649,7 +649,7 @@ static int f2fs_write_check_point_pack(void)
sum->entries[0].ofs_in_node = 0;
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the sum_blk to disk!!!\n");
return -1;
}
@ -659,7 +659,7 @@ static int f2fs_write_check_point_pack(void)
SET_SUM_TYPE((&sum->footer), SUM_TYPE_NODE);
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the sum_blk to disk!!!\n");
return -1;
}
@ -668,14 +668,14 @@ static int f2fs_write_check_point_pack(void)
memset(sum, 0, sizeof(struct f2fs_summary_block));
SET_SUM_TYPE((&sum->footer), SUM_TYPE_NODE);
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(sum, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the sum_blk to disk!!!\n");
return -1;
}
/* 8. cp page2 */
cp_seg_blk_offset += blk_size_bytes;
if (dev_write(config.fd, ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the ckp to disk!!!\n");
return -1;
}
@ -693,7 +693,7 @@ static int f2fs_write_check_point_pack(void)
cp_seg_blk_offset = (le32_to_cpu(super_block.segment0_blkaddr) +
config.blks_per_seg) *
blk_size_bytes;
if (dev_write(config.fd, ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(ckp, cp_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the ckp to disk!!!\n");
return -1;
}
@ -713,8 +713,7 @@ static int f2fs_write_super_block(void)
memcpy(zero_buff + F2FS_SUPER_OFFSET, &super_block,
sizeof(super_block));
for (index = 0; index < 2; index++) {
if (dev_write(config.fd, zero_buff,
index * F2FS_BLKSIZE, F2FS_BLKSIZE)) {
if (dev_write(zero_buff, index * F2FS_BLKSIZE, F2FS_BLKSIZE)) {
MSG(1, "\tError: While while writing supe_blk \
on disk!!! index : %d\n", index);
return -1;
@ -778,17 +777,15 @@ static int f2fs_write_root_inode(void)
config.blks_per_seg;
main_area_node_seg_blk_offset *= blk_size_bytes;
if (dev_write(config.fd, raw_node,
main_area_node_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(raw_node, main_area_node_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the raw_node to disk!!!\n");
return -1;
}
memset(raw_node, 0xff, sizeof(struct f2fs_node));
if (dev_write(config.fd, raw_node,
main_area_node_seg_blk_offset + F2FS_BLKSIZE,
F2FS_BLKSIZE)) {
main_area_node_seg_blk_offset += F2FS_BLKSIZE;
if (dev_write(raw_node, main_area_node_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the raw_node to disk!!!\n");
return -1;
}
@ -825,7 +822,7 @@ static int f2fs_update_nat_root(void)
nat_seg_blk_offset = le32_to_cpu(super_block.nat_blkaddr);
nat_seg_blk_offset *= blk_size_bytes;
if (dev_write(config.fd, nat_blk, nat_seg_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(nat_blk, nat_seg_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the nat_blk set0 to disk!\n");
return -1;
}
@ -865,7 +862,7 @@ static int f2fs_add_default_dentry_root(void)
config.blks_per_seg;
data_blk_offset *= blk_size_bytes;
if (dev_write(config.fd, dent_blk, data_blk_offset, F2FS_BLKSIZE)) {
if (dev_write(dent_blk, data_blk_offset, F2FS_BLKSIZE)) {
MSG(1, "\tError: While writing the dentry_blk to disk!!!\n");
return -1;
}