From patchwork Mon Sep 2 14:33:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namjae Jeon X-Patchwork-Id: 271965 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1C1692C00A3 for ; Tue, 3 Sep 2013 00:34:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758800Ab3IBOd4 (ORCPT ); Mon, 2 Sep 2013 10:33:56 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:63956 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756399Ab3IBOdy (ORCPT ); Mon, 2 Sep 2013 10:33:54 -0400 Received: by mail-pa0-f41.google.com with SMTP id bj1so5277680pad.14 for ; Mon, 02 Sep 2013 07:33:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=F4ebhWNmyA0i0NM/r8CHh8Vm86OqTlFqgGMFuIIoh8A=; b=nHV3a+qLlCbkMN1OGG3v7q/YYfmb80p3XopcyNB5/Fm7z3k5dSS4M1AngcdUMwAzbz Hpz59d3gwrnFM0DIpYzrpP4Y2FcHIu6KKqH47Rrzk30a2ofQls9KL5LqoHtvSS1auJkb 0Tn9JApOveGORy0W/8NUNfMPlHmqDuPMw5lhENPdm63oXtwukP4gmPKxpcA7XFb5vTUe 0rxIN6T/F6GyhsSWLRkrpRmlF9WNBhvxHqLZ9AseFW/q7tiDMOAtnWcYuPhicFLmdW+9 2+CCjF64WXYepxAigidaRyZ/q4poZ8T3gjRFDRTgzxeV/xIaU5e8a2MVBtgFrivGO27P qY4Q== X-Received: by 10.66.154.169 with SMTP id vp9mr1895244pab.190.1378132433430; Mon, 02 Sep 2013 07:33:53 -0700 (PDT) Received: from linkinjeon-Aspire-One-522.kornet ([61.84.85.169]) by mx.google.com with ESMTPSA id wp8sm16265471pbc.26.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Sep 2013 07:33:53 -0700 (PDT) From: Namjae Jeon To: viro@zeniv.linux.org.uk, mtk.manpages@gmail.com, tytso@mit.edu, adilger.kernel@dilger.ca, bpm@sgi.com, elder@kernel.org, hch@infradead.org, david@fromorbit.com Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, xfs@oss.sgi.com, a.sangwan@samsung.com, Namjae Jeon , Namjae Jeon Subject: [PATCH v2 4/7] xfsprogs: xfsio: add support FALLOC_FL_COLLAPSE_RANGE for fallocate Date: Mon, 2 Sep 2013 23:33:39 +0900 Message-Id: <1378132420-2953-1-git-send-email-linkinjeon@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Namjae Jeon Add support FALLOC_FL_COLLAPSE_RANGE for fallocate. Signed-off-by: Namjae Jeon Signed-off-by: Ashish Sangwan --- io/prealloc.c | 39 ++++++++++++++++++++++++++++++++++++++- man/man8/xfs_io.8 | 6 ++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/io/prealloc.c b/io/prealloc.c index 8380646..e7ff940 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 @@ -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 nullify the hole by shifting extents into it"); + 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