aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--METADATA6
-rw-r--r--fsck/dump.c213
-rw-r--r--fsck/fsck.c4
-rw-r--r--fsck/fsck.h4
-rw-r--r--fsck/main.c29
-rw-r--r--fsck/mount.c14
-rw-r--r--man/dump.f2fs.817
-rw-r--r--man/f2fs_io.82
-rw-r--r--man/mkfs.f2fs.83
-rw-r--r--mkfs/f2fs_format.c13
-rw-r--r--tools/f2fs_io/f2fs_io.c11
11 files changed, 248 insertions, 68 deletions
diff --git a/METADATA b/METADATA
index 5ab453a..ea3542f 100644
--- a/METADATA
+++ b/METADATA
@@ -8,13 +8,13 @@ third_party {
license_type: RESTRICTED
last_upgrade_date {
year: 2024
- month: 4
- day: 9
+ month: 5
+ day: 24
}
homepage: "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/"
identifier {
type: "Git"
value: "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"
- version: "5da4e5241503b385e4a7e75b1b2bb3367b38be96"
+ version: "c1a97862b05d8a736ad8719939395c61bd71c982"
}
}
diff --git a/fsck/dump.c b/fsck/dump.c
index b2e990b..90e3e0e 100644
--- a/fsck/dump.c
+++ b/fsck/dump.c
@@ -247,7 +247,26 @@ out:
printf("\n");
}
-static void dump_data_blk(struct f2fs_sb_info *sbi, __u64 offset, u32 blkaddr)
+static void dump_folder_contents(struct f2fs_sb_info *sbi, u8 *bitmap,
+ struct f2fs_dir_entry *dentry,
+ __u8 (*filenames)[F2FS_SLOT_LEN], int max)
+{
+ int i;
+ int name_len;
+
+ for (i = 0; i < max; i++) {
+ if (test_bit_le(i, bitmap) == 0)
+ continue;
+ name_len = le16_to_cpu(dentry[i].name_len);
+ if (name_len == 1 && filenames[i][0] == '.')
+ continue;
+ if (name_len == 2 && filenames[i][0] == '.' && filenames[i][1] == '.')
+ continue;
+ dump_node(sbi, le32_to_cpu(dentry[i].ino), 1, NULL, 0, 1);
+ }
+}
+
+static void dump_data_blk(struct f2fs_sb_info *sbi, __u64 offset, u32 blkaddr, bool is_folder)
{
char buf[F2FS_BLKSIZE];
@@ -288,12 +307,19 @@ static void dump_data_blk(struct f2fs_sb_info *sbi, __u64 offset, u32 blkaddr)
ASSERT(ret >= 0);
}
- /* write blkaddr */
- dev_write_dump(buf, offset, F2FS_BLKSIZE);
+ if (is_folder) {
+ struct f2fs_dentry_block *d = (struct f2fs_dentry_block *) buf;
+
+ dump_folder_contents(sbi, d->dentry_bitmap, F2FS_DENTRY_BLOCK_DENTRIES(d),
+ F2FS_DENTRY_BLOCK_FILENAMES(d), NR_DENTRY_IN_BLOCK);
+ } else {
+ /* write blkaddr */
+ dev_write_dump(buf, offset, F2FS_BLKSIZE);
+ }
}
static void dump_node_blk(struct f2fs_sb_info *sbi, int ntype,
- u32 nid, u32 addr_per_block, u64 *ofs)
+ u32 nid, u32 addr_per_block, u64 *ofs, int is_dir)
{
struct node_info ni;
struct f2fs_node *node_blk;
@@ -330,20 +356,20 @@ static void dump_node_blk(struct f2fs_sb_info *sbi, int ntype,
switch (ntype) {
case TYPE_DIRECT_NODE:
dump_data_blk(sbi, *ofs * F2FS_BLKSIZE,
- le32_to_cpu(node_blk->dn.addr[i]));
+ le32_to_cpu(node_blk->dn.addr[i]), is_dir);
(*ofs)++;
break;
case TYPE_INDIRECT_NODE:
dump_node_blk(sbi, TYPE_DIRECT_NODE,
le32_to_cpu(node_blk->in.nid[i]),
addr_per_block,
- ofs);
+ ofs, is_dir);
break;
case TYPE_DOUBLE_INDIRECT_NODE:
dump_node_blk(sbi, TYPE_INDIRECT_NODE,
le32_to_cpu(node_blk->in.nid[i]),
addr_per_block,
- ofs);
+ ofs, is_dir);
break;
}
}
@@ -351,7 +377,7 @@ static void dump_node_blk(struct f2fs_sb_info *sbi, int ntype,
}
#ifdef HAVE_FSETXATTR
-static void dump_xattr(struct f2fs_sb_info *sbi, struct f2fs_node *node_blk)
+static void dump_xattr(struct f2fs_sb_info *sbi, struct f2fs_node *node_blk, int is_dir)
{
void *xattr;
void *last_base_addr;
@@ -405,12 +431,24 @@ static void dump_xattr(struct f2fs_sb_info *sbi, struct f2fs_node *node_blk)
DBG(1, "fd %d xattr_name %s\n", c.dump_fd, xattr_name);
#if defined(__linux__)
- ret = fsetxattr(c.dump_fd, xattr_name, value,
- le16_to_cpu(ent->e_value_size), 0);
+ if (is_dir) {
+ ret = setxattr(".", xattr_name, value,
+ le16_to_cpu(ent->e_value_size), 0);
+ } else {
+ ret = fsetxattr(c.dump_fd, xattr_name, value,
+ le16_to_cpu(ent->e_value_size), 0);
+ }
+
#elif defined(__APPLE__)
- ret = fsetxattr(c.dump_fd, xattr_name, value,
- le16_to_cpu(ent->e_value_size), 0,
- XATTR_CREATE);
+ if (is_dir) {
+ ret = setxattr(".", xattr_name, value,
+ le16_to_cpu(ent->e_value_size), 0,
+ XATTR_CREATE);
+ } else {
+ ret = fsetxattr(c.dump_fd, xattr_name, value,
+ le16_to_cpu(ent->e_value_size), 0,
+ XATTR_CREATE);
+ }
#endif
if (ret)
MSG(0, "XATTR index 0x%x set xattr failed error %d\n",
@@ -423,7 +461,7 @@ static void dump_xattr(struct f2fs_sb_info *sbi, struct f2fs_node *node_blk)
}
#else
static void dump_xattr(struct f2fs_sb_info *UNUSED(sbi),
- struct f2fs_node *UNUSED(node_blk))
+ struct f2fs_node *UNUSED(node_blk), int UNUSED(is_dir))
{
MSG(0, "XATTR does not support\n");
}
@@ -435,13 +473,29 @@ static int dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
u32 i = 0;
u64 ofs = 0;
u32 addr_per_block;
+ bool is_dir = S_ISDIR(le16_to_cpu(node_blk->i.i_mode));
+ int ret = 0;
- if((node_blk->i.i_inline & F2FS_INLINE_DATA)) {
+ if ((node_blk->i.i_inline & F2FS_INLINE_DATA)) {
DBG(3, "ino[0x%x] has inline data!\n", nid);
/* recover from inline data */
dev_write_dump(((unsigned char *)node_blk) + INLINE_DATA_OFFSET,
0, MAX_INLINE_DATA(node_blk));
- return -1;
+ ret = -1;
+ goto dump_xattr;
+ }
+
+ if ((node_blk->i.i_inline & F2FS_INLINE_DENTRY)) {
+ void *inline_dentry = inline_data_addr(node_blk);
+ struct f2fs_dentry_ptr d;
+
+ make_dentry_ptr(&d, node_blk, inline_dentry, 2);
+
+ DBG(3, "ino[0x%x] has inline dentries!\n", nid);
+ /* recover from inline dentry */
+ dump_folder_contents(sbi, d.bitmap, d.dentry, d.filename, d.max);
+ ret = -1;
+ goto dump_xattr;
}
c.show_file_map_max_offset = f2fs_max_file_offset(&node_blk->i);
@@ -450,7 +504,7 @@ static int dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
/* check data blocks in inode */
for (i = 0; i < ADDRS_PER_INODE(&node_blk->i); i++, ofs++)
dump_data_blk(sbi, ofs * F2FS_BLKSIZE, le32_to_cpu(
- node_blk->i.i_addr[get_extra_isize(node_blk) + i]));
+ node_blk->i.i_addr[get_extra_isize(node_blk) + i]), is_dir);
/* check node blocks in inode */
for (i = 0; i < 5; i++) {
@@ -458,29 +512,75 @@ static int dump_inode_blk(struct f2fs_sb_info *sbi, u32 nid,
dump_node_blk(sbi, TYPE_DIRECT_NODE,
le32_to_cpu(F2FS_INODE_I_NID(&node_blk->i, i)),
addr_per_block,
- &ofs);
+ &ofs,
+ is_dir);
else if (i == 2 || i == 3)
dump_node_blk(sbi, TYPE_INDIRECT_NODE,
le32_to_cpu(F2FS_INODE_I_NID(&node_blk->i, i)),
addr_per_block,
- &ofs);
+ &ofs,
+ is_dir);
else if (i == 4)
dump_node_blk(sbi, TYPE_DOUBLE_INDIRECT_NODE,
le32_to_cpu(F2FS_INODE_I_NID(&node_blk->i, i)),
addr_per_block,
- &ofs);
+ &ofs,
+ is_dir);
else
ASSERT(0);
}
/* last block in extent cache */
print_extent(true);
+dump_xattr:
+ dump_xattr(sbi, node_blk, is_dir);
+ return ret;
+}
- dump_xattr(sbi, node_blk);
- return 0;
+static void dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,
+ struct f2fs_node *node_blk, char *path)
+{
+ struct f2fs_inode *inode = &node_blk->i;
+ int ret;
+
+ c.dump_fd = open(path, O_TRUNC|O_CREAT|O_RDWR, 0666);
+ ASSERT(c.dump_fd >= 0);
+
+ /* dump file's data */
+ dump_inode_blk(sbi, ni->ino, node_blk);
+
+ /* adjust file size */
+ ret = ftruncate(c.dump_fd, le32_to_cpu(inode->i_size));
+ ASSERT(ret >= 0);
+
+ close(c.dump_fd);
}
-static int dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,
- struct f2fs_node *node_blk, int force)
+static void dump_folder(struct f2fs_sb_info *sbi, struct node_info *ni,
+ struct f2fs_node *node_blk, char *path, int is_root)
+{
+ if (!is_root) {
+#if defined(__MINGW32__)
+ if (mkdir(path) < 0 && errno != EEXIST) {
+ MSG(0, "Failed to create directory %s\n", path);
+ return;
+ }
+#else
+ if (mkdir(path, 0777) < 0 && errno != EEXIST) {
+ MSG(0, "Failed to create directory %s\n", path);
+ return;
+ }
+#endif
+ ASSERT(chdir(path) == 0);
+ }
+ /* dump folder data */
+ dump_inode_blk(sbi, ni->ino, node_blk);
+ if (!is_root)
+ ASSERT(chdir("..") == 0);
+}
+
+static int dump_filesystem(struct f2fs_sb_info *sbi, struct node_info *ni,
+ struct f2fs_node *node_blk, int force, char *base_path,
+ bool is_base, bool allow_folder)
{
struct f2fs_inode *inode = &node_blk->i;
u32 imode = le16_to_cpu(inode->i_mode);
@@ -489,6 +589,7 @@ static int dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,
char path[1024] = {0};
char ans[255] = {0};
int is_encrypted = file_is_encrypt(inode);
+ int is_root = sbi->root_ino_num == ni->nid;
int ret;
if (is_encrypted) {
@@ -496,11 +597,15 @@ static int dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,
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");
+ if ((!S_ISREG(imode) && !S_ISLNK(imode) && !(S_ISDIR(imode) && allow_folder))) {
+ MSG(force, "Not a valid file type\n\n");
return -1;
}
+ if (!is_root && (namelen == 0 || namelen > F2FS_NAME_LEN)) {
+ MSG(force, "Wrong name info\n\n");
+ return -1;
+ }
+ base_path = base_path ?: "./lost_found";
if (force)
goto dump;
@@ -508,31 +613,49 @@ static int dump_file(struct f2fs_sb_info *sbi, struct node_info *ni,
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] ");
+ printf("Do you want to dump this %s into %s/? [Y/N] ",
+ S_ISREG(imode) || S_ISLNK(imode) ? "file" : "folder",
+ base_path);
ret = scanf("%s", ans);
ASSERT(ret >= 0);
if (!strcasecmp(ans, "y")) {
dump:
- ret = system("mkdir -p ./lost_found");
- ASSERT(ret >= 0);
-
- /* make a file */
- strncpy(name, (const char *)inode->i_name, namelen);
- name[namelen] = 0;
- sprintf(path, "./lost_found/%s", name);
+ if (is_base) {
+ ASSERT(getcwd(path, sizeof(path)) != NULL);
+#if defined(__MINGW32__)
+ ret = mkdir(base_path);
+#else
+ ret = mkdir(base_path, 0777);
+#endif
- c.dump_fd = open(path, O_TRUNC|O_CREAT|O_RDWR, 0666);
- ASSERT(c.dump_fd >= 0);
+ ASSERT(ret == 0 || errno == EEXIST);
+ ASSERT(chdir(base_path) == 0);
+ }
- /* dump file's data */
- dump_inode_blk(sbi, ni->ino, node_blk);
+ /* make a file */
+ if (!is_root) {
+ strncpy(name, (const char *)inode->i_name, namelen);
+ name[namelen] = 0;
+ }
- /* adjust file size */
- ret = ftruncate(c.dump_fd, le32_to_cpu(inode->i_size));
- ASSERT(ret >= 0);
+ if (S_ISREG(imode) || S_ISLNK(imode)) {
+ dump_file(sbi, ni, node_blk, name);
+ } else {
+ dump_folder(sbi, ni, node_blk, name, is_root);
+ }
- close(c.dump_fd);
+#if !defined(__MINGW32__)
+ /* fix up mode/owner */
+ if (c.preserve_perms) {
+ if (is_root)
+ strncpy(name, ".", 2);
+ ASSERT(chmod(name, imode) == 0);
+ ASSERT(chown(name, inode->i_uid, inode->i_gid) == 0);
+ }
+#endif
+ if (is_base)
+ ASSERT(chdir(path) == 0);
}
return 0;
}
@@ -582,7 +705,7 @@ void dump_node_scan_disk(struct f2fs_sb_info *sbi, nid_t nid)
free(node_blk);
}
-int 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, char *base_path, int base, int allow_folder)
{
struct node_info ni;
struct f2fs_node *node_blk;
@@ -617,7 +740,7 @@ int dump_node(struct f2fs_sb_info *sbi, nid_t nid, int force)
print_node_info(sbi, node_blk, force);
if (ni.ino == ni.nid)
- ret = dump_file(sbi, &ni, node_blk, force);
+ ret = dump_filesystem(sbi, &ni, node_blk, force, base_path, base, allow_folder);
} else {
print_node_info(sbi, node_blk, force);
MSG(force, "Invalid (i)node block\n\n");
diff --git a/fsck/fsck.c b/fsck/fsck.c
index 5d345d0..7400dcf 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -1651,7 +1651,7 @@ static void print_dentry(struct f2fs_sb_info *sbi, __u8 *name,
d = d->next;
}
printf("/%s", new);
- if (dump_node(sbi, le32_to_cpu(dentry[idx].ino), 0))
+ if (dump_node(sbi, le32_to_cpu(dentry[idx].ino), 0, NULL, 0, 0))
printf("\33[2K\r");
} else {
for (i = 1; i < depth; i++)
@@ -3632,7 +3632,7 @@ int fsck_verify(struct f2fs_sb_info *sbi)
if (!strcasecmp(ans, "y")) {
for (i = 0; i < fsck->nr_nat_entries; i++) {
if (f2fs_test_bit(i, fsck->nat_area_bitmap))
- dump_node(sbi, i, 1);
+ dump_node(sbi, i, 1, NULL, 1, 0);
}
}
}
diff --git a/fsck/fsck.h b/fsck/fsck.h
index f5282e2..6cac926 100644
--- a/fsck/fsck.h
+++ b/fsck/fsck.h
@@ -270,12 +270,14 @@ struct dump_option {
int end_ssa;
int32_t blk_addr;
nid_t scan_nid;
+ int use_root_nid;
+ char *base_path;
};
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 int dump_node(struct f2fs_sb_info *, nid_t, int);
+extern int dump_node(struct f2fs_sb_info *, nid_t, int, char *, int, int);
extern int dump_info_from_blkaddr(struct f2fs_sb_info *, u32);
extern unsigned int start_bidx_of_node(unsigned int, struct f2fs_node *);
extern void dump_node_scan_disk(struct f2fs_sb_info *sbi, nid_t nid);
diff --git a/fsck/main.c b/fsck/main.c
index c4d0956..6edc902 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -34,7 +34,7 @@ struct f2fs_fsck gfsck;
INIT_FEATURE_TABLE;
-#ifdef WITH_SLOAD
+#if defined(WITH_SLOAD) || defined(WITH_DUMP)
static char *absolute_path(const char *file)
{
char *ret;
@@ -384,7 +384,7 @@ void f2fs_parse_options(int argc, char *argv[])
}
} else if (!strcmp("dump.f2fs", prog)) {
#ifdef WITH_DUMP
- const char *option_string = "d:i:I:n:Ms:Sa:b:V";
+ const char *option_string = "d:fi:I:n:Mo:Prs:Sa:b:Vy";
static struct dump_option dump_opt = {
.nid = 0, /* default root ino */
.start_nat = -1,
@@ -395,6 +395,8 @@ void f2fs_parse_options(int argc, char *argv[])
.end_ssa = -1,
.blk_addr = -1,
.scan_nid = 0,
+ .use_root_nid = 0,
+ .base_path = NULL,
};
c.func = DUMP;
@@ -456,6 +458,24 @@ void f2fs_parse_options(int argc, char *argv[])
ret = sscanf(optarg, "%x",
&dump_opt.blk_addr);
break;
+ case 'y':
+ case 'f':
+ c.force = 1;
+ break;
+ case 'r':
+ dump_opt.use_root_nid = 1;
+ break;
+ case 'o':
+ dump_opt.base_path = absolute_path(optarg);
+ break;
+ case 'P':
+#if defined(__MINGW32__)
+ MSG(0, "-P not supported for Windows\n");
+ err = EWRONG_OPT;
+#else
+ c.preserve_perms = 1;
+#endif
+ break;
case 'V':
show_version(prog);
exit(0);
@@ -914,6 +934,9 @@ static void do_dump(struct f2fs_sb_info *sbi)
struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);
u32 flag = le32_to_cpu(ckpt->ckpt_flags);
+ if (opt->use_root_nid)
+ opt->nid = sbi->root_ino_num;
+
if (opt->end_nat == -1)
opt->end_nat = NM_I(sbi)->max_nid;
if (opt->end_sit == -1)
@@ -929,7 +952,7 @@ static void do_dump(struct f2fs_sb_info *sbi)
if (opt->blk_addr != -1)
dump_info_from_blkaddr(sbi, opt->blk_addr);
if (opt->nid)
- dump_node(sbi, opt->nid, 0);
+ dump_node(sbi, opt->nid, c.force, opt->base_path, 1, 1);
if (opt->scan_nid)
dump_node_scan_disk(sbi, opt->scan_nid);
diff --git a/fsck/mount.c b/fsck/mount.c
index b983920..8524335 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -429,20 +429,26 @@ void print_extention_list(struct f2fs_super_block *sb, int cold)
printf("%s file extentsions\n", cold ? "cold" : "hot");
- for (i = start; i < end; i++) {
+ for (i = 0; i < end - start; i++) {
if (c.layout) {
printf("%-30s %-8.8s\n", "extension_list",
- sb->extension_list[i]);
+ sb->extension_list[start + i]);
} else {
if (i % 4 == 0)
printf("%-30s\t\t[", "");
- printf("%-8.8s", sb->extension_list[i]);
+ printf("%-8.8s", sb->extension_list[start + i]);
- if (i % 4 == 4 - 1 || i == end - start - 1)
+ if (i % 4 == 4 - 1)
printf("]\n");
}
}
+
+ for (; i < round_up(end - start, 4) * 4; i++) {
+ printf("%-8.8s", "");
+ if (i % 4 == 4 - 1)
+ printf("]\n");
+ }
}
static void DISP_label(const char *name)
diff --git a/man/dump.f2fs.8 b/man/dump.f2fs.8
index 94bf5f3..60d6783 100644
--- a/man/dump.f2fs.8
+++ b/man/dump.f2fs.8
@@ -44,7 +44,8 @@ is used to retrieve f2fs metadata (usually in a disk partition).
\fIdevice\fP is the special file corresponding to the device (e.g.
\fI/dev/sdXX\fP).
-Currently, it can retrieve 1) a file given its inode number, 2) NAT
+Currently, it can retrieve 1) a file or folder given its inode number
+(folders are dumped recursively), 2) NAT
entries into a file, 3) SIT entries into a file, 4) SSA entries into
a file, 5) reverse information from the given block address.
.PP
@@ -56,6 +57,20 @@ is 0 on success and -1 on failure.
.BI \-i " inode number"
Specify an inode number to dump out.
.TP
+.BI \-r
+Dump out from the root inode.
+.TP
+.BI \-f
+Do not prompt before dumping
+.TP
+.BI \-y
+Alias for \-f
+.TP
+.BI \-o " path"
+Dump inodes to the given path
+.BI \-P
+Preserve mode/owner/group for dumped inode
+.TP
.BI \-I " inode number"
Specify an inode number and scan full disk to dump out, include history inode block
.TP
diff --git a/man/f2fs_io.8 b/man/f2fs_io.8
index f097bde..b9c9dc8 100644
--- a/man/f2fs_io.8
+++ b/man/f2fs_io.8
@@ -44,7 +44,7 @@ going down with metadata flush
going down with fsck mark
.RE
.TP
-\fBpinfile\fR \fI[get|set] [file]\fR
+\fBpinfile\fR \fI[get|set|unset] [file]\fR
Get or set the pinning status on a file.
.TP
\fBfadvise\fR \fI[advice] [offset] [length] [file]\fR
diff --git a/man/mkfs.f2fs.8 b/man/mkfs.f2fs.8
index 0dc367b..1f0c724 100644
--- a/man/mkfs.f2fs.8
+++ b/man/mkfs.f2fs.8
@@ -208,6 +208,9 @@ Enable casefolding support in the filesystem. Optional flags can be passed with
.TP
.B compression
Enable support for filesystem level compression. Requires extra attr.
+.TP
+.B ro
+Enable readonly feature to eliminate OVP/SSA on-disk layout for small readonly partition.
.RE
.TP
.BI \-C " encoding:flags"
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index e26a513..c9d335a 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -296,17 +296,19 @@ static int f2fs_prepare_super_block(void)
for (i = 0; i < c.ndevs; i++) {
if (i == 0) {
c.devices[i].total_segments =
- (c.devices[i].total_sectors *
+ ((c.devices[i].total_sectors *
c.sector_size - zone_align_start_offset) /
- segment_size_bytes;
+ segment_size_bytes) / c.segs_per_zone *
+ c.segs_per_zone;
c.devices[i].start_blkaddr = 0;
c.devices[i].end_blkaddr = c.devices[i].total_segments *
c.blks_per_seg - 1 +
sb->segment0_blkaddr;
} else {
c.devices[i].total_segments =
- c.devices[i].total_sectors /
- (c.sectors_per_blk * c.blks_per_seg);
+ (c.devices[i].total_sectors /
+ (c.sectors_per_blk * c.blks_per_seg)) /
+ c.segs_per_zone * c.segs_per_zone;
c.devices[i].start_blkaddr =
c.devices[i - 1].end_blkaddr + 1;
c.devices[i].end_blkaddr = c.devices[i].start_blkaddr +
@@ -321,8 +323,7 @@ static int f2fs_prepare_super_block(void)
c.total_segments += c.devices[i].total_segments;
}
- set_sb(segment_count, (c.total_segments / c.segs_per_zone *
- c.segs_per_zone));
+ set_sb(segment_count, c.total_segments);
set_sb(segment_count_ckpt, F2FS_NUMBER_OF_CHECKPOINT_PACK);
set_sb(sit_blkaddr, get_sb(segment0_blkaddr) +
diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
index b8e4f02..a7b593a 100644
--- a/tools/f2fs_io/f2fs_io.c
+++ b/tools/f2fs_io/f2fs_io.c
@@ -442,7 +442,7 @@ static void do_fadvise(int argc, char **argv, const struct cmd_desc *cmd)
#define pinfile_desc "pin file control"
#define pinfile_help \
-"f2fs_io pinfile [get|set] [file]\n\n" \
+"f2fs_io pinfile [get|set|unset] [file]\n\n" \
"get/set pinning given the file\n" \
static void do_pinfile(int argc, char **argv, const struct cmd_desc *cmd)
@@ -464,7 +464,14 @@ static void do_pinfile(int argc, char **argv, const struct cmd_desc *cmd)
ret = ioctl(fd, F2FS_IOC_SET_PIN_FILE, &pin);
if (ret != 0)
die_errno("F2FS_IOC_SET_PIN_FILE failed");
- printf("set_pin_file: %u blocks moved in %s\n", ret, argv[2]);
+ printf("%s pinfile: %u blocks moved in %s\n",
+ argv[1], ret, argv[2]);
+ } else if (!strcmp(argv[1], "unset")) {
+ pin = 0;
+ ret = ioctl(fd, F2FS_IOC_SET_PIN_FILE, &pin);
+ if (ret != 0)
+ die_errno("F2FS_IOC_SET_PIN_FILE failed");
+ printf("%s pinfile in %s\n", argv[1], argv[2]);
} else if (!strcmp(argv[1], "get")) {
unsigned int flags;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 20:53:33 +0000