From patchwork Tue Mar 19 06:06:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10858855 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 385C917E9 for ; Tue, 19 Mar 2019 06:19:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1779A29186 for ; Tue, 19 Mar 2019 06:19:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B95229338; Tue, 19 Mar 2019 06:19:28 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C291029186 for ; Tue, 19 Mar 2019 06:19:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A7913211DF24D; Mon, 18 Mar 2019 23:19:27 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D5D41211DCDB8 for ; Mon, 18 Mar 2019 23:19:26 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Mar 2019 23:19:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,496,1544515200"; d="scan'208";a="156246127" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga001.fm.intel.com with ESMTP; 18 Mar 2019 23:19:26 -0700 Subject: [PATCH 6/6] security/keys/encrypted: Drop export of key_type_encrypted From: Dan Williams To: keyrings@vger.kernel.org Date: Mon, 18 Mar 2019 23:06:47 -0700 Message-ID: <155297560738.2276575.13044997734939158888.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <155297557534.2276575.16264199708584900090.stgit@dwillia2-desk3.amr.corp.intel.com> References: <155297557534.2276575.16264199708584900090.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Howells , linux-kernel@vger.kernel.org, Mimi Zohar , linux-nvdimm@lists.01.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP Now that all users lookup the key type by name, drop the export and the direct module dependency. Cc: Mimi Zohar Cc: David Howells Signed-off-by: Dan Williams --- include/keys/encrypted-type.h | 2 -- security/keys/encrypted-keys/encrypted.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/keys/encrypted-type.h b/include/keys/encrypted-type.h index 1d4541370a64..dd509835b4a4 100644 --- a/include/keys/encrypted-type.h +++ b/include/keys/encrypted-type.h @@ -33,6 +33,4 @@ struct encrypted_key_payload { u8 payload_data[0]; /* payload data + datablob + hmac */ }; -extern struct key_type key_type_encrypted; - #endif /* _KEYS_ENCRYPTED_TYPE_H */ diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 06925d3b30c9..c3999d5e2a19 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -1012,7 +1012,7 @@ static void encrypted_destroy(struct key *key) kzfree(key->payload.data[0]); } -struct key_type key_type_encrypted = { +static struct key_type key_type_encrypted = { .name = "encrypted", .instantiate = encrypted_instantiate, .update = encrypted_update, @@ -1020,7 +1020,6 @@ struct key_type key_type_encrypted = { .describe = user_describe, .read = encrypted_read, }; -EXPORT_SYMBOL_GPL(key_type_encrypted); static int __init init_encrypted(void) {