xfsprog: xfsio: Add support FALLOC_FL_COLLAPSE_RANGE for fallocate

Add support FALLOC_FL_COLLAPSE_RANGE for fallocate.

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/io/prealloc.c b/io/prealloc.c
index 8380646ed83b7acfcc8543a67ccab0c916bedfff..d697f827900a93077601a9dd8cfe33894d1c15dd 100644 (file)
--- 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 767b50ed86005697d6e7444a4a9e0b0bb95bd35d..9543b20425c61e7c57ee6cd4fa5625025e90a08e 100644 (file)
--- 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