From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC763C433E1 for ; Fri, 21 Aug 2020 18:29:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91213230FF for ; Fri, 21 Aug 2020 18:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598034566; bh=ND4FcgD/NUSJ8C4KRjBaer7sEEz7pzhowVhqTtPqG0U=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=Mj31Zmchp5NaA7oH/HrrtqxVCu1z6oJCHKM5s6Du2Nlulan0Iefi+rC9qAYvAMmW9 6JC8TEowwnd8/RNxMfSGxM9QzOjQ7n/mWGiSOJb+bPlJDWxuV5h/OzU1P38+CrnhB7 Dn6l/jDUBnzGlk0IiR/ocx3AokrgkjtpkFtjT9Tg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726831AbgHUS3Z (ORCPT ); Fri, 21 Aug 2020 14:29:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:59370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725916AbgHUS2Q (ORCPT ); Fri, 21 Aug 2020 14:28:16 -0400 Received: from tleilax.com (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 378C823101; Fri, 21 Aug 2020 18:28:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598034496; bh=ND4FcgD/NUSJ8C4KRjBaer7sEEz7pzhowVhqTtPqG0U=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BbdAviWSwqSwfnEpaHQYLHh/5oyL+NVvNkC/ZgwAFLbVICvQYYCxlb+XkaeU+nlm1 r6xd9SLq8ssVootlbvvcjZTrOFrydCzTiAuiVcWPFiJF/vy9m1P9/h2piDF828RwJo kypdvqDmHp0KVCkKz3h+XDB0/ediGyhDGQzgiPTA= From: Jeff Layton To: ceph-devel@vger.kernel.org, linux-fscrypt@vger.kernel.org Subject: [RFC PATCH 03/14] fscrypt: don't balk when inode is already marked encrypted Date: Fri, 21 Aug 2020 14:28:02 -0400 Message-Id: <20200821182813.52570-4-jlayton@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200821182813.52570-1-jlayton@kernel.org> References: <20200821182813.52570-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Cephfs (currently) sets this flag early and only fetches the context later. Eventually we may not need this, but for now it prevents this warning from popping. Signed-off-by: Jeff Layton --- fs/crypto/keysetup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index fea6226afc2b..587335dc7cb9 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -474,7 +474,7 @@ int fscrypt_get_encryption_info(struct inode *inode) const union fscrypt_context *dummy_ctx = fscrypt_get_dummy_context(inode->i_sb); - if (IS_ENCRYPTED(inode) || !dummy_ctx) { + if (!dummy_ctx) { fscrypt_warn(inode, "Error %d getting encryption context", res); -- 2.26.2