Received: by 10.213.65.68 with SMTP id h4csp280747imn; Fri, 23 Mar 2018 04:38:27 -0700 (PDT) X-Google-Smtp-Source: AG47ELswF+1g8ON+e/+AJmY8506KoIoOQr+k6xAqmhAhSI/Q+yvGz1hkGftO1FidkeSDNk3EAzQ5 X-Received: by 2002:a17:902:684:: with SMTP id 4-v6mr29583263plh.262.1521805107619; Fri, 23 Mar 2018 04:38:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521805107; cv=none; d=google.com; s=arc-20160816; b=gUW1FQKfm2RQJa6T0YSvRbktRsBGy1KcD8NTO1nQ8nzKfq2mGOSj/CjzkZKPPXcvSf 2P14LGAL2r67z4/PADIYJgs+2rbG5HcctOihMZNj6F8OF6GrUMyqwYwYPNF37matb/IJ a+R2yjfkx48TfmT5HSDgTA9iJ+kmAQidIwiwsT0fpDqITIxI18XYIM/VGKYDvetswPC3 hc1i7vQI0pRriiiVHkDoFnz8Ph/4/hqL9IRgtukcudn823k9g78p7Cy0A3KvPdome1ic m+1mUQwx2BognsGFTE7Oyj4lHAKskuPEhCu5gRqXZDt3fNLPQ606jPqNoAHy6MLvIjdV w9Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=7mP4wQ00Qq0tUuJKV3ua6yq/blGMPyEb+ndDWUaAdvU=; b=d0OL6bHf8ZEOIDUZrhKPm8maJZt6teuEr1D2l88kOHYsz+/kCWTg9N2BNUk98hhWQX zmg70Fl5eQReF1FTVn/F40ZodSCYCf16GHXfXPaTokG9WFkKR+3KNe3mJ+oyxl348ZMc Fede7VrrauI/xaD8M49wNpriKO+j8x2HNLtg8l5IIEiyCE5lC36IruJNOrj1buEOiMe1 qqDNltS/E2QHA374VnQwgig0Rycs9ZFyKTExopmUcPFE+y8NDp8P3CisFnojnVndWwuV Da6URk66x1R4KWk8YBnFjgRcIXaATmy3PblUyv5HhOWNCF2DOmbNkV6Yk7Ls3t2cJx8m EiSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e63-v6si1790691plb.91.2018.03.23.04.38.13; Fri, 23 Mar 2018 04:38:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754417AbeCWKEw (ORCPT + 99 others); Fri, 23 Mar 2018 06:04:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:39304 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754389AbeCWKEs (ORCPT ); Fri, 23 Mar 2018 06:04:48 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 172D013CB; Fri, 23 Mar 2018 10:04:47 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adam Borowski , Liu Bo , David Sterba , Sasha Levin Subject: [PATCH 4.9 023/177] btrfs: fix a bogus warning when converting only data or metadata Date: Fri, 23 Mar 2018 10:52:31 +0100 Message-Id: <20180323094206.211588633@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180323094205.090519271@linuxfoundation.org> References: <20180323094205.090519271@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Adam Borowski [ Upstream commit 14506127979a5a3d0c5d9b4cc76ce9d4ec23b717 ] If your filesystem has, eg, data:raid0 metadata:raid1, and you run "btrfs balance -dconvert=raid1", the meta.target field will be uninitialized. That's otherwise ok, as it's unused except for this warning. Thus, let's use the existing set of raid levels for the comparison. As a side effect, non-convert balances will now nag about data>metadata. Signed-off-by: Adam Borowski Reviewed-by: Liu Bo Signed-off-by: David Sterba Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/volumes.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3765,6 +3765,7 @@ int btrfs_balance(struct btrfs_balance_c struct btrfs_ioctl_balance_args *bargs) { struct btrfs_fs_info *fs_info = bctl->fs_info; + u64 meta_target, data_target; u64 allowed; int mixed = 0; int ret; @@ -3861,11 +3862,16 @@ int btrfs_balance(struct btrfs_balance_c } } while (read_seqretry(&fs_info->profiles_lock, seq)); - if (btrfs_get_num_tolerated_disk_barrier_failures(bctl->meta.target) < - btrfs_get_num_tolerated_disk_barrier_failures(bctl->data.target)) { + /* if we're not converting, the target field is uninitialized */ + meta_target = (bctl->meta.flags & BTRFS_BALANCE_ARGS_CONVERT) ? + bctl->meta.target : fs_info->avail_metadata_alloc_bits; + data_target = (bctl->data.flags & BTRFS_BALANCE_ARGS_CONVERT) ? + bctl->data.target : fs_info->avail_data_alloc_bits; + if (btrfs_get_num_tolerated_disk_barrier_failures(meta_target) < + btrfs_get_num_tolerated_disk_barrier_failures(data_target)) { btrfs_warn(fs_info, "metadata profile 0x%llx has lower redundancy than data profile 0x%llx", - bctl->meta.target, bctl->data.target); + meta_target, data_target); } if (bctl->sys.flags & BTRFS_BALANCE_ARGS_CONVERT) {