From patchwork Mon Oct 18 18:04:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 12567575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0E9FC4321E for ; Mon, 18 Oct 2021 18:06:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AAAD06108E for ; Mon, 18 Oct 2021 18:06:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232286AbhJRSIz (ORCPT ); Mon, 18 Oct 2021 14:08:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:47298 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232292AbhJRSIp (ORCPT ); Mon, 18 Oct 2021 14:08:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7307B61279; Mon, 18 Oct 2021 18:06:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634580393; bh=2oTc9zOR2W7fHicIwjKn7Uh7jYUgbC6jK/peA7dYjG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k45jZydE8zGI86X02+uRUHS+2vYNMXMSi9A2e2+rQQvULdJIzj7KiO8gWXdr2nMir cNP3YQFIvYuL6aNB5WcLCEHouiDefoMj7q9nOpnuiEJ5q02l3PiD3urOSQdWKAB9p2 Phr6jL2ldD1tYaTnSdsTUPJyO+nG1HoQ1N6ZUUyp4hBj1ZmKXijZ1FGxiJc2pnbJ+n 4/7pau2YiKAvedeQRt8AELsUCyApSYzpHwe8+7WViA3N2pZUXmZyWISYYJGVUUOsK4 scboadz50hsAC+wO4vpcAaLDduoDtqs8WptSbcCngLpHX0fC5lGAfg3emFu9zMBwxO i3UL9ABwrCi7w== From: Eric Biggers To: linux-block@vger.kernel.org, Jens Axboe Cc: Satya Tangirala , dm-devel@redhat.com, linux-mmc@vger.kernel.org, linux-scsi@vger.kernel.org, Ulf Hansson , Christoph Hellwig , Mike Snitzer , "Martin K. Petersen" Subject: [PATCH v6 2/4] blk-crypto: rename keyslot-manager files to blk-crypto-profile Date: Mon, 18 Oct 2021 11:04:51 -0700 Message-Id: <20211018180453.40441-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018180453.40441-1-ebiggers@kernel.org> References: <20211018180453.40441-1-ebiggers@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Eric Biggers In preparation for renaming struct blk_keyslot_manager to struct blk_crypto_profile, rename the keyslot-manager.h and keyslot-manager.c source files. Renaming these files separately before making a lot of changes to their contents makes it easier for git to understand that they were renamed. Acked-by: Ulf Hansson # For MMC Reviewed-by: Christoph Hellwig Reviewed-by: Mike Snitzer Reviewed-by: Martin K. Petersen Signed-off-by: Eric Biggers --- block/Makefile | 2 +- block/blk-crypto-fallback.c | 2 +- block/{keyslot-manager.c => blk-crypto-profile.c} | 2 +- block/blk-crypto.c | 2 +- drivers/md/dm-core.h | 2 +- drivers/md/dm.c | 2 +- drivers/mmc/host/cqhci-crypto.c | 2 +- drivers/scsi/ufs/ufshcd.h | 2 +- include/linux/{keyslot-manager.h => blk-crypto-profile.h} | 0 include/linux/mmc/host.h | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename block/{keyslot-manager.c => blk-crypto-profile.c} (99%) rename include/linux/{keyslot-manager.h => blk-crypto-profile.h} (100%) diff --git a/block/Makefile b/block/Makefile index 74df168729ecb..602f7f47b7b6d 100644 --- a/block/Makefile +++ b/block/Makefile @@ -36,6 +36,6 @@ obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o obj-$(CONFIG_BLK_DEBUG_FS_ZONED)+= blk-mq-debugfs-zoned.o obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o obj-$(CONFIG_BLK_PM) += blk-pm.o -obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += keyslot-manager.o blk-crypto.o +obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += blk-crypto.o blk-crypto-profile.o obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o obj-$(CONFIG_BLOCK_HOLDER_DEPRECATED) += holder.o diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c index 1bcc1a1514248..08bfea292c754 100644 --- a/block/blk-crypto-fallback.c +++ b/block/blk-crypto-fallback.c @@ -12,9 +12,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/block/keyslot-manager.c b/block/blk-crypto-profile.c similarity index 99% rename from block/keyslot-manager.c rename to block/blk-crypto-profile.c index 1792159d12d18..1a235fa3c3e82 100644 --- a/block/keyslot-manager.c +++ b/block/blk-crypto-profile.c @@ -28,7 +28,7 @@ #define pr_fmt(fmt) "blk-crypto: " fmt -#include +#include #include #include #include diff --git a/block/blk-crypto.c b/block/blk-crypto.c index 8f53f4a1f9e2d..76ce7a5d2676b 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/md/dm-core.h b/drivers/md/dm-core.h index 55dccdfbcb22e..841ed87999e79 100644 --- a/drivers/md/dm-core.h +++ b/drivers/md/dm-core.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 7870e6460633f..4184fd8ccb084 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #define DM_MSG_PREFIX "core" diff --git a/drivers/mmc/host/cqhci-crypto.c b/drivers/mmc/host/cqhci-crypto.c index 6419cfbb4ab78..628bbfaf83124 100644 --- a/drivers/mmc/host/cqhci-crypto.c +++ b/drivers/mmc/host/cqhci-crypto.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include #include "cqhci-crypto.h" diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 41f6e06f91856..885fcf2e59224 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "unipro.h" #include diff --git a/include/linux/keyslot-manager.h b/include/linux/blk-crypto-profile.h similarity index 100% rename from include/linux/keyslot-manager.h rename to include/linux/blk-crypto-profile.h diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 0c0c9a0fdf578..725b1de417673 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include struct mmc_ios { unsigned int clock; /* clock rate */