* [f2fs-dev] [PATCH v2] f2fs_io: expend fallocate command
@ 2023-06-07 14:56 Yangtao Li via Linux-f2fs-devel
2023-06-08 1:56 ` Chao Yu
0 siblings, 1 reply; 2+ messages in thread
From: Yangtao Li via Linux-f2fs-devel @ 2023-06-07 14:56 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-kernel, Yangtao Li, linux-f2fs-devel
Expend fallocate command to support more flags.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
tools/f2fs_io/f2fs_io.c | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
index 1774eca..5a6a6a0 100644
--- a/tools/f2fs_io/f2fs_io.c
+++ b/tools/f2fs_io/f2fs_io.c
@@ -413,9 +413,13 @@ static void do_pinfile(int argc, char **argv, const struct cmd_desc *cmd)
#define fallocate_desc "fallocate"
#define fallocate_help \
-"f2fs_io fallocate [keep_size] [offset] [length] [file]\n\n" \
+"f2fs_io fallocate [-cipz] [keep_size] [offset] [length] [file]\n\n" \
"fallocate given the file\n" \
" [keep_size] : 1 or 0\n" \
+" -p : punch hole\n" \
+" -c : collapse range\n" \
+" -z : zero range\n" \
+" -i : insert range\n" \
static void do_fallocate(int argc, char **argv, const struct cmd_desc *cmd)
{
@@ -423,20 +427,43 @@ static void do_fallocate(int argc, char **argv, const struct cmd_desc *cmd)
off_t offset, length;
struct stat sb;
int mode = 0;
+ int c;
- if (argc != 5) {
+ while ((c = getopt(argc, argv, "cipz")) != -1) {
+ switch (c) {
+ case 'c':
+ mode |= FALLOC_FL_COLLAPSE_RANGE;
+ break;
+ case 'i':
+ mode |= FALLOC_FL_INSERT_RANGE;
+ break;
+ case 'p':
+ mode |= FALLOC_FL_PUNCH_HOLE;
+ break;
+ case 'z':
+ mode |= FALLOC_FL_ZERO_RANGE;
+ break;
+ default:
+ fputs(cmd->cmd_help, stderr);
+ exit(2);
+ }
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (argc != 4) {
fputs("Excess arguments\n\n", stderr);
fputs(cmd->cmd_help, stderr);
exit(1);
}
- if (!strcmp(argv[1], "1"))
+ if (!strcmp(argv[0], "1"))
mode |= FALLOC_FL_KEEP_SIZE;
- offset = atoi(argv[2]);
- length = atoll(argv[3]);
+ offset = atoi(argv[1]);
+ length = atoll(argv[2]);
- fd = xopen(argv[4], O_RDWR, 0);
+ fd = xopen(argv[3], O_RDWR, 0);
if (fallocate(fd, mode, offset, length) != 0)
die_errno("fallocate failed");
--
2.39.0
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [f2fs-dev] [PATCH v2] f2fs_io: expend fallocate command
2023-06-07 14:56 [f2fs-dev] [PATCH v2] f2fs_io: expend fallocate command Yangtao Li via Linux-f2fs-devel
@ 2023-06-08 1:56 ` Chao Yu
0 siblings, 0 replies; 2+ messages in thread
From: Chao Yu @ 2023-06-08 1:56 UTC (permalink / raw)
To: Yangtao Li, jaegeuk; +Cc: linux-kernel, linux-f2fs-devel
On 2023/6/7 22:56, Yangtao Li wrote:
> Expend fallocate command to support more flags.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
> ---
> tools/f2fs_io/f2fs_io.c | 39 +++++++++++++++++++++++++++++++++------
> 1 file changed, 33 insertions(+), 6 deletions(-)
>
> diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
> index 1774eca..5a6a6a0 100644
> --- a/tools/f2fs_io/f2fs_io.c
> +++ b/tools/f2fs_io/f2fs_io.c
> @@ -413,9 +413,13 @@ static void do_pinfile(int argc, char **argv, const struct cmd_desc *cmd)
>
> #define fallocate_desc "fallocate"
> #define fallocate_help \
> -"f2fs_io fallocate [keep_size] [offset] [length] [file]\n\n" \
> +"f2fs_io fallocate [-cipz] [keep_size] [offset] [length] [file]\n\n" \
Yangtao,
It missed to update man/f2fs_io.8.
Thanks,
> "fallocate given the file\n" \
> " [keep_size] : 1 or 0\n" \
> +" -p : punch hole\n" \
> +" -c : collapse range\n" \
> +" -z : zero range\n" \
> +" -i : insert range\n" \
>
> static void do_fallocate(int argc, char **argv, const struct cmd_desc *cmd)
> {
> @@ -423,20 +427,43 @@ static void do_fallocate(int argc, char **argv, const struct cmd_desc *cmd)
> off_t offset, length;
> struct stat sb;
> int mode = 0;
> + int c;
>
> - if (argc != 5) {
> + while ((c = getopt(argc, argv, "cipz")) != -1) {
> + switch (c) {
> + case 'c':
> + mode |= FALLOC_FL_COLLAPSE_RANGE;
> + break;
> + case 'i':
> + mode |= FALLOC_FL_INSERT_RANGE;
> + break;
> + case 'p':
> + mode |= FALLOC_FL_PUNCH_HOLE;
> + break;
> + case 'z':
> + mode |= FALLOC_FL_ZERO_RANGE;
> + break;
> + default:
> + fputs(cmd->cmd_help, stderr);
> + exit(2);
> + }
> + }
> + argc -= optind;
> + argv += optind;
> +
> + if (argc != 4) {
> fputs("Excess arguments\n\n", stderr);
> fputs(cmd->cmd_help, stderr);
> exit(1);
> }
>
> - if (!strcmp(argv[1], "1"))
> + if (!strcmp(argv[0], "1"))
> mode |= FALLOC_FL_KEEP_SIZE;
>
> - offset = atoi(argv[2]);
> - length = atoll(argv[3]);
> + offset = atoi(argv[1]);
> + length = atoll(argv[2]);
>
> - fd = xopen(argv[4], O_RDWR, 0);
> + fd = xopen(argv[3], O_RDWR, 0);
>
> if (fallocate(fd, mode, offset, length) != 0)
> die_errno("fallocate failed");
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-08 1:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-07 14:56 [f2fs-dev] [PATCH v2] f2fs_io: expend fallocate command Yangtao Li via Linux-f2fs-devel
2023-06-08 1:56 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).