From patchwork Tue Aug 23 20:01:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 1089672 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7NK2YJi029195 for ; Tue, 23 Aug 2011 20:02:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756094Ab1HWUCb (ORCPT ); Tue, 23 Aug 2011 16:02:31 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:56659 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755878Ab1HWUCa (ORCPT ); Tue, 23 Aug 2011 16:02:30 -0400 Received: by mail-bw0-f46.google.com with SMTP id 11so372435bke.19 for ; Tue, 23 Aug 2011 13:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=hncKNh/u5AYwmkd4CEUYOsMr8mcVx0Lw87QhtAnDGX0=; b=JiMCGp+anyzC7uokLYyPYyzMIP2ipJzMmhbcozksVJcGoo0aM4RKIIvcIeYxG5EI6q fqvVxzuDQegfF5F/VqNzuy1PSVekPxxoZrS8gAZkOBUFfW41QVkKGfLFCsuJxP9o04CV vTuB5PdsZ0jPOvS+N1JVOT+BhxOekcUalIuis= Received: by 10.204.133.17 with SMTP id d17mr1731701bkt.116.1314129749744; Tue, 23 Aug 2011 13:02:29 -0700 (PDT) Received: from localhost ([31.28.235.172]) by mx.google.com with ESMTPS id zw12sm80043bkb.60.2011.08.23.13.02.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 13:02:28 -0700 (PDT) From: Ilya Dryomov To: linux-btrfs@vger.kernel.org Cc: Chris Mason , Hugo Mills , idryomov@gmail.com Subject: [PATCH 11/21] Btrfs: devid filter Date: Tue, 23 Aug 2011 23:01:52 +0300 Message-Id: <1314129722-31601-12-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1314129722-31601-1-git-send-email-idryomov@gmail.com> References: <1314129722-31601-1-git-send-email-idryomov@gmail.com> 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]); Tue, 23 Aug 2011 20:02:34 +0000 (UTC) Relocate chunks which have at least one stripe located on a device with devid X. Signed-off-by: Ilya Dryomov --- fs/btrfs/volumes.c | 23 +++++++++++++++++++++++ fs/btrfs/volumes.h | 1 + 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b49ecfa..ce2a9e0 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2220,6 +2220,23 @@ static int chunk_usage_filter(struct btrfs_fs_info *fs_info, u64 chunk_offset, return ret; } +static int chunk_devid_filter(struct extent_buffer *leaf, + struct btrfs_chunk *chunk, + struct btrfs_restripe_args *rargs) +{ + struct btrfs_stripe *stripe; + int num_stripes = btrfs_chunk_num_stripes(leaf, chunk); + int i; + + for (i = 0; i < num_stripes; i++) { + stripe = btrfs_stripe_nr(chunk, i); + if (btrfs_stripe_devid(leaf, stripe) == rargs->devid) + return 0; + } + + return 1; +} + static int chunk_soft_convert_filter(u64 chunk_profile, struct btrfs_restripe_args *rargs) { @@ -2269,6 +2286,12 @@ static int should_restripe_chunk(struct btrfs_root *root, return 0; } + /* devid filter */ + if ((rargs->flags & BTRFS_RESTRIPE_ARGS_DEVID) && + chunk_devid_filter(leaf, chunk, rargs)) { + return 0; + } + /* soft profile changing mode */ if ((rargs->flags & BTRFS_RESTRIPE_ARGS_SOFT) && chunk_soft_convert_filter(chunk_type, rargs)) { diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index c6baf4b..1b8dc3e 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -187,6 +187,7 @@ struct map_lookup { */ #define BTRFS_RESTRIPE_ARGS_PROFILES (1ULL << 0) #define BTRFS_RESTRIPE_ARGS_USAGE (1ULL << 1) +#define BTRFS_RESTRIPE_ARGS_DEVID (1ULL << 2) /* * Profile changing flags. When SOFT is set we won't relocate chunk if