From patchwork Tue Feb 25 19:15:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Czerner X-Patchwork-Id: 324083 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 389092C00AD for ; Wed, 26 Feb 2014 06:15:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753531AbaBYTPm (ORCPT ); Tue, 25 Feb 2014 14:15:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14540 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753414AbaBYTPl (ORCPT ); Tue, 25 Feb 2014 14:15:41 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1PJFbmS015724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 25 Feb 2014 14:15:38 -0500 Received: from localhost.localdomain.com (vpn1-4-133.ams2.redhat.com [10.36.4.133]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1PJFZ50016647; Tue, 25 Feb 2014 14:15:35 -0500 From: Lukas Czerner To: linux-ext4@vger.kernel.org Cc: xfs@oss.sgi.com, linux-fsdevel@vger.kernel.org, Lukas Czerner Subject: [PATCH] xfs_io: add fzero command for zeroing range via fallocate Date: Tue, 25 Feb 2014 20:15:33 +0100 Message-Id: <1393355733-12099-1-git-send-email-lczerner@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Add fzero command which zeroes a range of the file using fallocate FALLOC_FL_ZERO_RANGE flag. Signed-off-by: Lukas Czerner Reviewed-by: Dave Chinner --- io/prealloc.c | 42 +++++++++++++++++++++++++++++++++++++++++- man/man8/xfs_io.8 | 5 +++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/io/prealloc.c b/io/prealloc.c index d697f82..71ca877 100644 --- a/io/prealloc.c +++ b/io/prealloc.c @@ -33,6 +33,10 @@ #define FALLOC_FL_COLLAPSE_RANGE 0x08 #endif +#ifndef FALLOC_FL_ZERO_RANGE +#define FALLOC_FL_ZERO_RANGE 0x10 +#endif + static cmdinfo_t allocsp_cmd; static cmdinfo_t freesp_cmd; static cmdinfo_t resvsp_cmd; @@ -42,6 +46,7 @@ static cmdinfo_t zero_cmd; static cmdinfo_t falloc_cmd; static cmdinfo_t fpunch_cmd; static cmdinfo_t fcollapse_cmd; +static cmdinfo_t fzero_cmd; #endif static int @@ -230,6 +235,31 @@ fcollapse_f( } return 0; } + +static int +fzero_f( + int argc, + char **argv) +{ + xfs_flock64_t segment; + int mode = FALLOC_FL_ZERO_RANGE; + int index = 1; + + if (strncmp(argv[index], "-k", 3) == 0) { + mode |= FALLOC_FL_KEEP_SIZE; + index++; + } + + if (!offset_length(argv[index], argv[index + 1], &segment)) + return 0; + + if (fallocate(file->fd, mode, + segment.l_start, segment.l_len)) { + perror("fallocate"); + return 0; + } + return 0; +} #endif /* HAVE_FALLOCATE */ void @@ -312,7 +342,17 @@ prealloc_init(void) 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"); + _("de-allocates space and eliminates the hole by shifting extents"); add_command(&fcollapse_cmd); + + fzero_cmd.name = "fzero"; + fzero_cmd.cfunc = fzero_f; + fzero_cmd.argmin = 2; + fzero_cmd.argmax = 3; + fzero_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK; + fzero_cmd.args = _("[-k] off len"); + fzero_cmd.oneline = + _("zeroes space and eliminates holes by preallocating"); + add_command(&fzero_cmd); #endif /* HAVE_FALLOCATE */ } diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index 9543b20..e95cf70 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -392,6 +392,11 @@ the FALLOC_FL_PUNCH_HOLE flag as described in the .BR fallocate (2) manual page. .TP +.BI fzero " offset length" +Call fallocate with FALLOC_FL_ZERO_RANGE flag as described in the +.BR fallocate (2) +manual page to allocate and zero blocks within the range. +.TP .BI truncate " offset" Truncates the current file at the given offset using .BR ftruncate (2).