From patchwork Tue Aug 23 20:01:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 1089652 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 p7NK2SM3029031 for ; Tue, 23 Aug 2011 20:02:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756054Ab1HWUCZ (ORCPT ); Tue, 23 Aug 2011 16:02:25 -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 S1755878Ab1HWUCY (ORCPT ); Tue, 23 Aug 2011 16:02:24 -0400 Received: by mail-bw0-f46.google.com with SMTP id 11so372435bke.19 for ; Tue, 23 Aug 2011 13:02:23 -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=CE1DmKjYu+3l0dW8xKMGCJZb28VgAJnZAvd9LZwzihM=; b=SM0WFU2lE6K4JLLxlyAMP3t2cMJLCsEBEdty1rZdneZdqqqX3yBP8y2aBsGC5jb8nN JsKPROWNINzJVS3c0TLV70rGVn3QYJdSj9EtvZjTdm70MUNhQMiac/LP65lmk3fltZSO wv7pH1IOBaE2b1ycBU5flzQ1LofBtLv/HHQcM= Received: by 10.204.133.196 with SMTP id g4mr1663808bkt.40.1314129743427; Tue, 23 Aug 2011 13:02:23 -0700 (PDT) Received: from localhost ([31.28.235.172]) by mx.google.com with ESMTPS id h18sm82436bkr.34.2011.08.23.13.02.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 13:02:22 -0700 (PDT) From: Ilya Dryomov To: linux-btrfs@vger.kernel.org Cc: Chris Mason , Hugo Mills , idryomov@gmail.com Subject: [PATCH 09/21] Btrfs: profiles filter Date: Tue, 23 Aug 2011 23:01:50 +0300 Message-Id: <1314129722-31601-10-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:28 +0000 (UTC) Select chunks based on a given profile mask. Signed-off-by: Ilya Dryomov --- fs/btrfs/volumes.c | 20 ++++++++++++++++++++ fs/btrfs/volumes.h | 5 +++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index ff252ef..f045615 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2179,6 +2179,20 @@ static void unset_restripe_control(struct btrfs_fs_info *fs_info) * Restripe filters. Return 1 if chunk should be 'filtered out', * ie should not be restriped. */ +static int chunk_profiles_filter(u64 chunk_profile, + struct btrfs_restripe_args *rargs) +{ + chunk_profile &= BTRFS_BLOCK_GROUP_PROFILE_MASK; + + if (chunk_profile == 0) + chunk_profile = BTRFS_AVAIL_ALLOC_BIT_SINGLE; + + if (rargs->profiles & chunk_profile) + return 0; + + return 1; +} + static int chunk_soft_convert_filter(u64 chunk_profile, struct btrfs_restripe_args *rargs) { @@ -2216,6 +2230,12 @@ static int should_restripe_chunk(struct btrfs_root *root, else if (chunk_type & BTRFS_BLOCK_GROUP_METADATA) rargs = &rctl->meta; + /* profiles filter */ + if ((rargs->flags & BTRFS_RESTRIPE_ARGS_PROFILES) && + chunk_profiles_filter(chunk_type, 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 1852f69..9f96ad8 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -183,6 +183,11 @@ struct map_lookup { #define BTRFS_RESTRIPE_FORCE (1ULL << 3) /* + * Restripe filters + */ +#define BTRFS_RESTRIPE_ARGS_PROFILES (1ULL << 0) + +/* * Profile changing flags. When SOFT is set we won't relocate chunk if * it already has the target profile (even though it may be * half-filled).