From patchwork Sat May 31 23:48:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Worrall X-Patchwork-Id: 4276831 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE1B2BEEA7 for ; Sat, 31 May 2014 23:49:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28CF120340 for ; Sat, 31 May 2014 23:49:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BBC2202F8 for ; Sat, 31 May 2014 23:49:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756746AbaEaXs4 (ORCPT ); Sat, 31 May 2014 19:48:56 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:49703 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755761AbaEaXsu (ORCPT ); Sat, 31 May 2014 19:48:50 -0400 Received: by mail-wg0-f48.google.com with SMTP id k14so3474754wgh.31 for ; Sat, 31 May 2014 16:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qg1O4QhMaIz2tQx1u6pIL9dCkCHg9ajwXVgk54hwhu8=; b=CUe2/ccxmNnlRMHeVCPfcq84xNpWChxV6zQTaKxZy6epoTtvhkTekp3Oo2YAVV9PIL GeS8XZIadfX0tz+jwFn1vrLIw+widnTHAnMLPQDCnDz+mZ5fOZd4XnVW+4f0IsXEJy1a Y6pmHEt4aMJFJEKG5I5j7D/vbXFP9oFrN6bEukquZgLn317jnQ9y5stYBMZYtBkHh+a3 iZfevn22A/KAeukZRkKU65zWtrFvgXtSFW1ve+6etZD+WtxU2R8nlL8y5nvj9kTKHojz veDyn/zMpqIgVq3k+RwPBmW+Dl7h7i+2UiaVy9JdQwsazayhet5LyL78Bp1M9h4lPTmf GDxg== X-Received: by 10.180.183.131 with SMTP id em3mr9994486wic.56.1401580129505; Sat, 31 May 2014 16:48:49 -0700 (PDT) Received: from ubuntu.home (host86-148-25-253.range86-148.btcentralplus.com. [86.148.25.253]) by mx.google.com with ESMTPSA id em5sm18605440wic.23.2014.05.31.16.48.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 31 May 2014 16:48:48 -0700 (PDT) From: Philip Worrall To: linux-btrfs@vger.kernel.org Cc: Philip Worrall Subject: [PATCH 6/8] Btrfs: Ensure LZ4 feature flags are set when mounting with LZ4 Date: Sat, 31 May 2014 23:48:34 +0000 Message-Id: <1401580116-10458-7-git-send-email-philip.worrall@googlemail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401580116-10458-1-git-send-email-philip.worrall@googlemail.com> References: <1401580116-10458-1-git-send-email-philip.worrall@googlemail.com> 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.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Signed-off-by: Philip Worrall --- fs/btrfs/disk-io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 6d1ac7d..56bab54 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2479,7 +2479,8 @@ int open_ctree(struct super_block *sb, features |= BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF; if (tree_root->fs_info->compress_type == BTRFS_COMPRESS_LZO) features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO; - + if (tree_root->fs_info->compress_type == BTRFS_COMPRESS_LZ4) + features |= BTRFS_FEATURE_INCOMPAT_COMPRESS_LZ4; if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA) printk(KERN_ERR "BTRFS: has skinny extents\n");