From patchwork Mon Jul 23 21:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10541051 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 BAC33112E for ; Mon, 23 Jul 2018 21:18:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9EDB28517 for ; Mon, 23 Jul 2018 21:18:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C0FC2851B; Mon, 23 Jul 2018 21:18:35 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 36D9728517 for ; Mon, 23 Jul 2018 21:18:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388128AbeGWWVi (ORCPT ); Mon, 23 Jul 2018 18:21:38 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:10067 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388119AbeGWWVh (ORCPT ); Mon, 23 Jul 2018 18:21:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1532380714; x=1563916714; h=from:to:cc:subject:date:message-id; bh=kNs9NSC0q2wgn5j0LEkPwUpJnBj5rM6p3xyngY4aH8A=; b=puOd+z2ZNUxQknfESATnWjEO6TFSoNFBePg1BnFOqWgt9cKo0GOjZFby wMWgtdmG6Xatkav3N4sWswWNq9k7nC2IldVCD70Wt4LB5U+BCtDU6Jaz7 BRdeXhLK572Ptoa7eJnMBZmaGKnBfc57kCGd0V5bp/mgW0XN1I8u/JPvv 17KERdbNVDRqQUCv5NCqXDiL8evcPpsS46QQU7yk3PJb3vtLsbjF0hqx+ cpCWaj7LAwFsIUAoh9Vhpon/NnLO8NIVcu89DIOWJRSfHVotxYm/v15h7 /BIYolzVGXucO5BjiBf23f7rM2oJdiRwk2IOMFah59OW5sSRNgVl38OoR A==; X-IronPort-AV: E=Sophos;i="5.51,394,1526313600"; d="scan'208";a="86153254" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 24 Jul 2018 05:18:34 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 23 Jul 2018 14:07:14 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com ([10.111.67.248]) by uls-op-cesaip01.wdc.com with ESMTP; 23 Jul 2018 14:18:34 -0700 From: Bart Van Assche To: Jens Axboe Cc: linux-block@vger.kernel.org, Christoph Hellwig , Bart Van Assche , Matias Bjorling , Ming Lei , Damien Le Moal Subject: [PATCH] block: Rename the null_blk_mod kernel module back into null_blk Date: Mon, 23 Jul 2018 14:18:33 -0700 Message-Id: <20180723211833.15498-1-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.18.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit ca4b2a011948 ("null_blk: add zone support") breaks several blktests scripts because it renamed the null_blk kernel module into null_blk_mod. Hence rename null_blk_mod back into null_blk. Fixes: ca4b2a011948 ("null_blk: add zone support") Signed-off-by: Bart Van Assche Cc: Matias Bjorling Cc: Christoph Hellwig Cc: Ming Lei Cc: Damien Le Moal --- drivers/block/Makefile | 6 +++--- drivers/block/{null_blk.c => null_blk_main.c} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename drivers/block/{null_blk.c => null_blk_main.c} (100%) diff --git a/drivers/block/Makefile b/drivers/block/Makefile index a0d88aa0c05d..8566b188368b 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -38,9 +38,9 @@ obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ obj-$(CONFIG_ZRAM) += zram/ -obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk_mod.o -null_blk_mod-objs := null_blk.o -null_blk_mod-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o +obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o +null_blk-objs := null_blk_main.o +null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o skd-y := skd_main.o swim_mod-y := swim.o swim_asm.o diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk_main.c similarity index 100% rename from drivers/block/null_blk.c rename to drivers/block/null_blk_main.c