2015-01-02 09:41:23

by Namjae Jeon

Subject: [PATCH v7 4/11] xfsprogs: xfs_io: add finsert command for insert range via fallocate

Add finsert command for fallocate FALLOC_FL_INSERT_RANGE flag.

Signed-off-by: Namjae Jeon <[email protected]>
Signed-off-by: Ashish Sangwan <[email protected]>
---
io/prealloc.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/io/prealloc.c b/io/prealloc.c
index aba6b44..11b1e12 100644
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -37,6 +37,10 @@
#define FALLOC_FL_ZERO_RANGE 0x10
#endif

+#ifndef FALLOC_FL_INSERT_RANGE
+#define FALLOC_FL_INSERT_RANGE 0x20
+#endif
+
static cmdinfo_t allocsp_cmd;
static cmdinfo_t freesp_cmd;
static cmdinfo_t resvsp_cmd;
@@ -46,6 +50,7 @@ static cmdinfo_t zero_cmd;
static cmdinfo_t falloc_cmd;
static cmdinfo_t fpunch_cmd;
static cmdinfo_t fcollapse_cmd;
+static cmdinfo_t finsert_cmd;
static cmdinfo_t fzero_cmd;
#endif

@@ -169,11 +174,14 @@ fallocate_f(
int mode = 0;
int c;

- while ((c = getopt(argc, argv, "ckp")) != EOF) {
+ while ((c = getopt(argc, argv, "cikp")) != EOF) {
switch (c) {
case 'c':
mode = FALLOC_FL_COLLAPSE_RANGE;
break;
+ case 'i':
+ mode = FALLOC_FL_INSERT_RANGE;
+ break;
case 'k':
mode = FALLOC_FL_KEEP_SIZE;
break;
@@ -237,6 +245,25 @@ fcollapse_f(
}

static int
+finsert_f(
+ int argc,
+ char **argv)
+{
+ xfs_flock64_t segment;
+ int mode = FALLOC_FL_INSERT_RANGE;
+
+ if (!offset_length(argv[1], argv[2], &segment))
+ return 0;
+
+ if (fallocate(file->fd, mode,
+ segment.l_start, segment.l_len)) {
+ perror("fallocate");
+ return 0;
+ }
+ return 0;
+}
+
+static int
fzero_f(
int argc,
char **argv)
@@ -345,6 +372,16 @@ prealloc_init(void)
_("de-allocates space and eliminates the hole by shifting extents");
add_command(&fcollapse_cmd);

+ finsert_cmd.name = "finsert";
+ finsert_cmd.cfunc = finsert_f;
+ finsert_cmd.argmin = 2;
+ finsert_cmd.argmax = 2;
+ finsert_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK;
+ finsert_cmd.args = _("off len");
+ finsert_cmd.oneline =
+ _("creates new space for writing within file by shifting extents");
+ add_command(&finsert_cmd);
+
fzero_cmd.name = "fzero";
fzero_cmd.cfunc = fzero_f;
fzero_cmd.argmin = 2;
--
1.7.11-rc0

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

2015-01-06 18:12:55

by Brian Foster

Subject: Re: [PATCH v7 4/11] xfsprogs: xfs_io: add finsert command for insert range via fallocate

On Fri, Jan 02, 2015 at 06:41:23PM +0900, Namjae Jeon wrote:
> Add finsert command for fallocate FALLOC_FL_INSERT_RANGE flag.
>
> Signed-off-by: Namjae Jeon <[email protected]>
> Signed-off-by: Ashish Sangwan <[email protected]>
> ---

Looks good...

Reviewed-by: Brian Foster <[email protected]>

> io/prealloc.c | 39 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 38 insertions(+), 1 deletion(-)
>
> diff --git a/io/prealloc.c b/io/prealloc.c
> index aba6b44..11b1e12 100644
> --- a/io/prealloc.c
> +++ b/io/prealloc.c
> @@ -37,6 +37,10 @@
> #define FALLOC_FL_ZERO_RANGE 0x10
> #endif
>
> +#ifndef FALLOC_FL_INSERT_RANGE
> +#define FALLOC_FL_INSERT_RANGE 0x20
> +#endif
> +
> static cmdinfo_t allocsp_cmd;
> static cmdinfo_t freesp_cmd;
> static cmdinfo_t resvsp_cmd;
> @@ -46,6 +50,7 @@ static cmdinfo_t zero_cmd;
> static cmdinfo_t falloc_cmd;
> static cmdinfo_t fpunch_cmd;
> static cmdinfo_t fcollapse_cmd;
> +static cmdinfo_t finsert_cmd;
> static cmdinfo_t fzero_cmd;
> #endif
>
> @@ -169,11 +174,14 @@ fallocate_f(
> int mode = 0;
> int c;
>
> - while ((c = getopt(argc, argv, "ckp")) != EOF) {
> + while ((c = getopt(argc, argv, "cikp")) != EOF) {
> switch (c) {
> case 'c':
> mode = FALLOC_FL_COLLAPSE_RANGE;
> break;
> + case 'i':
> + mode = FALLOC_FL_INSERT_RANGE;
> + break;
> case 'k':
> mode = FALLOC_FL_KEEP_SIZE;
> break;
> @@ -237,6 +245,25 @@ fcollapse_f(
> }
>
> static int
> +finsert_f(
> + int argc,
> + char **argv)
> +{
> + xfs_flock64_t segment;
> + int mode = FALLOC_FL_INSERT_RANGE;
> +
> + if (!offset_length(argv[1], argv[2], &segment))
> + return 0;
> +
> + if (fallocate(file->fd, mode,
> + segment.l_start, segment.l_len)) {
> + perror("fallocate");
> + return 0;
> + }
> + return 0;
> +}
> +
> +static int
> fzero_f(
> int argc,
> char **argv)
> @@ -345,6 +372,16 @@ prealloc_init(void)
> _("de-allocates space and eliminates the hole by shifting extents");
> add_command(&fcollapse_cmd);
>
> + finsert_cmd.name = "finsert";
> + finsert_cmd.cfunc = finsert_f;
> + finsert_cmd.argmin = 2;
> + finsert_cmd.argmax = 2;
> + finsert_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK;
> + finsert_cmd.args = _("off len");
> + finsert_cmd.oneline =
> + _("creates new space for writing within file by shifting extents");
> + add_command(&finsert_cmd);
> +
> fzero_cmd.name = "fzero";
> fzero_cmd.cfunc = fzero_f;
> fzero_cmd.argmin = 2;
> --
> 1.7.11-rc0
>

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs