xfs
[Top] [All Lists]

[PATCH v4 4/10] xfsprog: xfsio: Add support FALLOC_FL_COLLAPSE_RANGE for

To: viro@xxxxxxxxxxxxxxxxxx, dchinner@xxxxxxxxxxxxx, bpm@xxxxxxx, tytso@xxxxxxx, adilger.kernel@xxxxxxxxx, jack@xxxxxxx
Subject: [PATCH v4 4/10] xfsprog: xfsio: Add support FALLOC_FL_COLLAPSE_RANGE for fallocate
From: Namjae Jeon <linkinjeon@xxxxxxxxx>
Date: Sun, 8 Dec 2013 23:00:35 +0900
Cc: linux-fsdevel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, linux-ext4@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Namjae Jeon <linkinjeon@xxxxxxxxx>, Namjae Jeon <namjae.jeon@xxxxxxxxxxx>, Ashish Sangwan <a.sangwan@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ia/eM2qo0c12lEk75djtGlSBI+NkU6BPmxP9QF7SiBk=; b=JRefbpU+JzCau3PHsHfjgo37hwPGIKF5obfobYifu3bWME/1UfCMam4lVHWRp9HlZZ SvFsg3smTA+usnKkxWTrPL+OvmzFLsyIZIudToPQk5Hml77ANKe1PDk5/0yYsgMYXCm2 MM6c8hTBg59ISi4l7r5FFTyY0YzyWQyyqidWU+1rXbzd3S3ZWBgB2HTBcKH8USUwugHA AGdT9SnC0Flqa6CYTst/c9HlpAXo7DQgpZki0mKK/eE85xfbaIiIh+bqh5d/pn01gEq5 v/fGPIkFn8RCpb82oLx3aK7cOPdfrRVl6PUUvgaFluqbYPYHgo4OX+iMTduVck+9aG3B 7VwQ==
From: Namjae Jeon <namjae.jeon@xxxxxxxxxxx>

Add support FALLOC_FL_COLLAPSE_RANGE for fallocate.

Signed-off-by: Namjae Jeon <namjae.jeon@xxxxxxxxxxx>
Signed-off-by: Ashish Sangwan <a.sangwan@xxxxxxxxxxx>
---
 io/prealloc.c     |   41 +++++++++++++++++++++++++++++++++++++++--
 man/man8/xfs_io.8 |    6 ++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/io/prealloc.c b/io/prealloc.c
index 8380646..d697f82 100644
--- a/io/prealloc.c
+++ b/io/prealloc.c
@@ -29,6 +29,10 @@
 #define FALLOC_FL_PUNCH_HOLE   0x02
 #endif
 
+#ifndef FALLOC_FL_COLLAPSE_RANGE
+#define FALLOC_FL_COLLAPSE_RANGE 0x08
+#endif
+
 static cmdinfo_t allocsp_cmd;
 static cmdinfo_t freesp_cmd;
 static cmdinfo_t resvsp_cmd;
@@ -37,6 +41,7 @@ static cmdinfo_t zero_cmd;
 #if defined(HAVE_FALLOCATE)
 static cmdinfo_t falloc_cmd;
 static cmdinfo_t fpunch_cmd;
+static cmdinfo_t fcollapse_cmd;
 #endif
 
 static int
@@ -159,8 +164,11 @@ fallocate_f(
        int             mode = 0;
        int             c;
 
-       while ((c = getopt(argc, argv, "kp")) != EOF) {
+       while ((c = getopt(argc, argv, "ckp")) != EOF) {
                switch (c) {
+               case 'c':
+                       mode = FALLOC_FL_COLLAPSE_RANGE;
+                       break;
                case 'k':
                        mode = FALLOC_FL_KEEP_SIZE;
                        break;
@@ -203,6 +211,25 @@ fpunch_f(
        }
        return 0;
 }
+
+static int
+fcollapse_f(
+       int             argc,
+       char            **argv)
+{
+       xfs_flock64_t   segment;
+       int             mode = FALLOC_FL_COLLAPSE_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;
+}
 #endif /* HAVE_FALLOCATE */
 
 void
@@ -263,7 +290,7 @@ prealloc_init(void)
        falloc_cmd.argmin = 2;
        falloc_cmd.argmax = -1;
        falloc_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK;
-       falloc_cmd.args = _("[-k] [-p] off len");
+       falloc_cmd.args = _("[-c] [-k] [-p] off len");
        falloc_cmd.oneline =
                _("allocates space associated with part of a file via 
fallocate");
        add_command(&falloc_cmd);
@@ -277,5 +304,15 @@ prealloc_init(void)
        fpunch_cmd.oneline =
                _("de-allocates space assocated with part of a file via 
fallocate");
        add_command(&fpunch_cmd);
+
+       fcollapse_cmd.name = "fcollapse";
+       fcollapse_cmd.cfunc = fcollapse_f;
+       fcollapse_cmd.argmin = 2;
+       fcollapse_cmd.argmax = 2;
+       fcollapse_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK;
+       fcollapse_cmd.args = _("off len");
+       fcollapse_cmd.oneline =
+       _("de-allocates space and eliminates the hole by shifting extents");
+       add_command(&fcollapse_cmd);
 #endif /* HAVE_FALLOCATE */
 }
diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8
index 767b50e..9543b20 100644
--- a/man/man8/xfs_io.8
+++ b/man/man8/xfs_io.8
@@ -380,6 +380,12 @@ will set the FALLOC_FL_KEEP_SIZE flag as described in
 .PD
 .RE
 .TP
+.BI fcollapse " offset length"
+Call fallocate with FALLOC_FL_COLLAPSE_RANGE flag as described in the
+.BR fallocate (2)
+manual page to de-allocates blocks and eliminates the hole created in this 
process
+by shifting data blocks into the hole.
+.TP
 .BI fpunch " offset length"
 Punches (de-allocates) blocks in the file by calling fallocate with 
 the FALLOC_FL_PUNCH_HOLE flag as described in the
-- 
1.7.9.5

<Prev in Thread] Current Thread [Next in Thread>