From patchwork Sun May 1 15:47:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Mills X-Patchwork-Id: 746092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p41FlYLh017568 for ; Sun, 1 May 2011 15:47:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760740Ab1EAPra (ORCPT ); Sun, 1 May 2011 11:47:30 -0400 Received: from frost.carfax.org.uk ([212.13.194.111]:2756 "EHLO frost.carfax.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758050Ab1EAPrV (ORCPT ); Sun, 1 May 2011 11:47:21 -0400 Received: from ruthven.carfax.org.uk ([10.0.0.10]) by frost.carfax.org.uk with esmtp (Exim 4.69) (envelope-from ) id 1QGYre-0004Zm-0e; Sun, 01 May 2011 15:47:18 +0000 Received: from [10.0.0.10] (helo=ruthven.carfax.org.uk) by ruthven.carfax.org.uk with esmtp (Exim 4.72) (envelope-from ) id 1QGYrd-0004hn-ON; Sun, 01 May 2011 16:47:17 +0100 From: Hugo Mills To: Btrfs mailing list , Chris Mason Subject: [PATCH v6 7/8] Balance filter for virtual address range Date: Sun, 1 May 2011 16:47:15 +0100 Message-Id: <3db2b2f9276c86dae66cb5fa43b5bf605d324c12.1304262467.git.hugo@carfax.org.uk> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: To: linux-btrfs@vger.kernel.org X-frost.carfax.org.uk-Spam-Score: -0.0 (/) X-frost.carfax.org.uk-Spam-Report: Spam detection software, running on the system "admin.kwak.bitfolk.com", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Implement the userspace side of the virtual address range filter. Signed-off-by: Hugo Mills --- btrfs_cmds.c | 22 ++++++++++++++++++++++ ioctl.h | 9 +++++++-- man/btrfs.8.in | 9 +++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) [...] Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 01 May 2011 15:47:34 +0000 (UTC) Implement the userspace side of the virtual address range filter. Signed-off-by: Hugo Mills --- btrfs_cmds.c | 22 ++++++++++++++++++++++ ioctl.h | 9 +++++++-- man/btrfs.8.in | 9 +++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/btrfs_cmds.c b/btrfs_cmds.c index 0f1434f..1f6149d 100644 --- a/btrfs_cmds.c +++ b/btrfs_cmds.c @@ -779,6 +779,12 @@ const struct filter_class_desc filter_class[] = { "devid=\n" "\tBalance only chunks which have a stripe on device .\n", BTRFS_BALANCE_FILTER_DEVID }, + { "vrange", + "vrange=,\n" + "\tBalances only chunks which have any bytes within the given\n" + "\trange of the filesystem's virtual address space.\n" + "\t is inclusive, is exclusive.\n", + BTRFS_BALANCE_FILTER_VIRTUAL_ADDRESS_RANGE }, { NULL, NULL, 0 } }; @@ -883,6 +889,22 @@ int parse_filter(struct btrfs_ioctl_balance_start *args, char *filters_string) return 15; } break; + + case BTRFS_BALANCE_FILTER_VIRTUAL_ADDRESS_RANGE: + errno = 0; + args->vrange_start = strtoull(part, NULL, 10); + if (errno != 0) { + fprintf(stderr, "ERROR: '%s' is not a valid start address\n", part); + return 15; + } + part = strtok_r(NULL, "=,", &subsave); + errno = 0; + args->vrange_end = strtoull(part, NULL, 10); + if (errno != 0) { + fprintf(stderr, "ERROR: '%s' is not a valid end address\n", part); + return 15; + } + break; } this_filter_string = strtok_r(NULL, ":", &saveptr); diff --git a/ioctl.h b/ioctl.h index e30687c..85c5dcc 100644 --- a/ioctl.h +++ b/ioctl.h @@ -142,7 +142,8 @@ struct btrfs_ioctl_balance_progress { #define BTRFS_BALANCE_FILTER_CHUNK_TYPE 0x2 #define BTRFS_BALANCE_FILTER_DEVID 0x4 -#define BTRFS_BALANCE_FILTER_MASK 0x7 +#define BTRFS_BALANCE_FILTER_VIRTUAL_ADDRESS_RANGE 0x8 +#define BTRFS_BALANCE_FILTER_MASK 0xf /* All the possible options for a filter */ struct btrfs_ioctl_balance_start { @@ -159,7 +160,11 @@ struct btrfs_ioctl_balance_start { /* For FILTER_DEVID */ __u64 devid; - __u64 spare[506]; /* Make up the size of the structure to 4088 + /* For FILTER_VIRTUAL_ADDRESS_RANGE */ + __u64 vrange_start; + __u64 vrange_end; + + __u64 spare[504]; /* Make up the size of the structure to 4088 * bytes for future expansion */ }; diff --git a/man/btrfs.8.in b/man/btrfs.8.in index 020260f..c49a82c 100644 --- a/man/btrfs.8.in +++ b/man/btrfs.8.in @@ -210,6 +210,15 @@ Select chunks which have data on device ID \fI\fR. This can be used, for example, to reduplicate data in a mirrored configuration where one drive has been lost due to hardware failure. +.TP +\fBvrange\fR=\fI\fB,\fI\fR + +Select chunks which have btrfs-internal virtual addresses within the +range \fI\fR (inclusive) to \fI\fR (exclusive). Given the +address of the last chunk moved, this filter can be used to restart a +cancelled or interrupted balance operation, by supplying a range of +\fB0,\fI\fR. + .SH EXIT STATUS \fBbtrfs\fR returns a zero exist status if it succeeds. Non zero is returned in case of failure.