From patchwork Mon Jan 5 10:07:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Dongsheng X-Patchwork-Id: 5566271 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CC75CBFE6A for ; Mon, 5 Jan 2015 10:10:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFF1B20149 for ; Mon, 5 Jan 2015 10:10:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11F752015A for ; Mon, 5 Jan 2015 10:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753204AbbAEKKJ (ORCPT ); Mon, 5 Jan 2015 05:10:09 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:24557 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751511AbbAEKKH (ORCPT ); Mon, 5 Jan 2015 05:10:07 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="55544417" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 05 Jan 2015 18:06:40 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t05A9Wxj017062; Mon, 5 Jan 2015 18:09:32 +0800 Received: from yds-PC.g08.fujitsu.local (10.167.226.66) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Mon, 5 Jan 2015 18:10:08 +0800 From: Dongsheng Yang To: , , CC: , Dongsheng Yang Subject: [PATCH v2 3/3] Btrfs: adapt df command to RAID5/6. Date: Mon, 5 Jan 2015 18:07:05 +0800 Message-ID: <1420452425-7874-3-git-send-email-yangds.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1420452425-7874-1-git-send-email-yangds.fnst@cn.fujitsu.com> References: <54AA5FB0.5020102@cn.fujitsu.com> <1420452425-7874-1-git-send-email-yangds.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.66] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we use btrfs with raid5/6, the output of df is unexpected as below. Example: # mkfs.btrfs -f /dev/vdf1 /dev/vdf2 -d raid5 # mount /dev/vdf1 /mnt # dd if=/dev/zero of=/mnt/zero bs=1M count=1000 # df -h /mnt Filesystem Size Used Avail Use% Mounted on /dev/vdf1 4.2G 1.3G 2.9G 32% /mnt [root@atest-guest linux_btrfs]# btrfs fi show /mnt Label: none uuid: f7fac7f2-3898-482e-9cf2-fbcd7fdd7084 Total devices 2 FS bytes used 1001.53MiB devid 1 size 2.00GiB used 1.85GiB path /dev/vdf1 devid 2 size 4.00GiB used 1.83GiB path /dev/vdf2 The @size should be 2G rather than 4.2G. This patch makes the btrfs_calc_avail_data_space() consider raid5/6, then we can get the correct result of it. Example: # mkfs.btrfs -f /dev/vdf1 /dev/vdf2 -d raid5 # mount /dev/vdf1 /mnt # dd if=/dev/zero of=/mnt/zero bs=1M count=1000 # df -h /mnt Filesystem Size Used Avail Use% Mounted on /dev/vdf1 2.0G 1.3G 713M 66% /mnt [root@atest-guest linux_btrfs]# btrfs fi show /mnt Label: none uuid: ea3a6e6e-fbe1-47aa-b4b5-bc37b98565d9 Total devices 2 FS bytes used 1001.53MiB devid 1 size 2.00GiB used 1.85GiB path /dev/vdf1 devid 2 size 4.00GiB used 1.83GiB path /dev/vdf2 Signed-off-by: Dongsheng Yang --- fs/btrfs/super.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 1f0f080..4a190de 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -52,6 +52,7 @@ #include "props.h" #include "xattr.h" #include "volumes.h" +#include "raid56.h" #include "export.h" #include "compression.h" #include "rcu-string.h" @@ -1688,6 +1689,14 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes) min_stripes = 4; num_stripes = 4; data_stripes = 2; + } else if (type & BTRFS_BLOCK_GROUP_RAID5) { + min_stripes = 2; + num_stripes = nr_devices; + data_stripes = num_stripes - nr_parity_stripes(type); + } else if (type & BTRFS_BLOCK_GROUP_RAID6) { + min_stripes = 3; + num_stripes = nr_devices; + data_stripes = num_stripes - nr_parity_stripes(type); } if (type & BTRFS_BLOCK_GROUP_DUP) @@ -1777,8 +1786,11 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes) while (nr_devices >= min_stripes) { if (num_stripes > nr_devices) { num_stripes = nr_devices; - if (type & BTRFS_BLOCK_GROUP_RAID0) - data_stripes = num_stripes; + /* Only RAID0, RAID5 and RAID6 will get here. + * And we can use the following calculation + * for all the three cases. + **/ + data_stripes = num_stripes - nr_parity_stripes(type); } if (devices_info[i].max_avail >= min_stripe_size) {