From patchwork Mon Nov 23 12:56:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 7680971 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4A239F54F for ; Mon, 23 Nov 2015 12:56:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 102E3206FC for ; Mon, 23 Nov 2015 12:56:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38B6B206F9 for ; Mon, 23 Nov 2015 12:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562AbbKWM4f (ORCPT ); Mon, 23 Nov 2015 07:56:35 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:47281 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753336AbbKWM41 (ORCPT ); Mon, 23 Nov 2015 07:56:27 -0500 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id tANCuOBn007426 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 23 Nov 2015 12:56:25 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id tANCuOtq016341 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 23 Nov 2015 12:56:24 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id tANCuOM1023322; Mon, 23 Nov 2015 12:56:24 GMT Received: from arch2.sg.oracle.com (/10.186.101.159) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 23 Nov 2015 04:56:24 -0800 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH v2 4/5] btrfs-progs: kernel based default features for btrfs-convert Date: Mon, 23 Nov 2015 20:56:17 +0800 Message-Id: <1448283378-10579-5-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448283378-10579-1-git-send-email-anand.jain@oracle.com> References: <1448283378-10579-1-git-send-email-anand.jain@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 btrfs-convert convert FS with latest default features enabled, and if the kernel is down-rev and does not support a latest feature then mount fails, as expected. This patch disables default features based on the running kernel. Signed-off-by: Anand Jain --- v2: Check if sysfs tells what features are supported btrfs-convert.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/btrfs-convert.c b/btrfs-convert.c index 73ac584..52ea12a 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2896,7 +2896,15 @@ int main(int argc, char *argv[]) int progress = 1; char *file; char fslabel[BTRFS_LABEL_SIZE]; - u64 features = BTRFS_MKFS_DEFAULT_FEATURES; + u64 features; + + if (btrfs_features_allowed_by_sysfs(&features)) + features = btrfs_features_allowed_by_kernel(); + + if (features) + features &= BTRFS_MKFS_DEFAULT_FEATURES; + else + features = BTRFS_MKFS_DEFAULT_FEATURES; while(1) { enum { GETOPT_VAL_NO_PROGRESS = 256 };