From patchwork Tue Dec 11 22:46:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10725183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA1D991E for ; Tue, 11 Dec 2018 22:48:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAEC529FE9 for ; Tue, 11 Dec 2018 22:48:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F3B12B6AE; Tue, 11 Dec 2018 22:48:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60E5B29FE9 for ; Tue, 11 Dec 2018 22:48:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726502AbeLKWsJ (ORCPT ); Tue, 11 Dec 2018 17:48:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:40512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbeLKWsI (ORCPT ); Tue, 11 Dec 2018 17:48:08 -0500 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7DABE20851; Tue, 11 Dec 2018 22:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544568487; bh=Gy4lOYUGRxaTUaq8Uyv8IaXHgq4SAXX1I8YYyBSpW5M=; h=From:To:Cc:Subject:Date:From; b=OGKZwLmaS0CzZ07CrD6Dc9xNF68ajZNH4drKw/HDrzfOmUK7fQd7XwwabgTamyaxC tbV3d+THtgN4FGxLNFUucqZMxLKtOQanhr7bOYWYsbfmoLQ5uzcaPvf050zqJrRpzB 3aRsqpAs2ua9xi/MDx90YZJGDChPkaoqNNWq/AZ4= From: Eric Biggers To: linux-fscrypt@vger.kernel.org, "Theodore Y . Ts'o" Cc: Chandan Rajendra , Krzysztof Kozlowski , linux-ext4@vger.kernel.org, Tony Lindgren , Kirill Tkhai Subject: [PATCH 0/2] fs-verity: fix !CONFIG_FS_VERITY case Date: Tue, 11 Dec 2018 14:46:49 -0800 Message-Id: <20181211224651.112510-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.20.0.405.gbc1bbc6f85-goog MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace the two patches that broken the !CONFIG_FS_VERITY case with fixed verisons. Chandan Rajendra (2): fsverity: Move verity status check to fsverity_file_open fsverity: Move verity status check to fsverity_prepare_setattr fs/ext4/file.c | 8 +++---- fs/ext4/inode.c | 8 +++---- fs/f2fs/file.c | 16 +++++-------- fs/verity/setup.c | 32 ++++--------------------- include/linux/fsverity.h | 50 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 61 insertions(+), 53 deletions(-) Tested-by: Tony Lindgren