From patchwork Tue Jul 4 16:52:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Hindborg X-Patchwork-Id: 115873 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1365500vqx; Tue, 4 Jul 2023 10:24:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlHAcfHNH1ITR+8r2+8OcYoqRTLpHXR10K6mMhc0lNzBehJE2UF3SFZ9c3rIf6FBrV8QcCjh X-Received: by 2002:a17:902:7b95:b0:1b7:facb:2e79 with SMTP id w21-20020a1709027b9500b001b7facb2e79mr9949956pll.18.1688491459066; Tue, 04 Jul 2023 10:24:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688491459; cv=none; d=google.com; s=arc-20160816; b=YJkPjeAAVaXhMKu8NkJzyzSwW9EljMeZb0OglsOZ+iwrf/S4YLZ2c2sxwPTl0Xc7RH 0HLOGLP9GwfEBniANicadMbufWUv/7gLWhqoh1W6/6BhuRYZx46dtLvYM6W8AKjBOaMm +f5ARoG+Lpb/qiCh7qnj6j6/bGOpUEiMalltlzoYHLcAgdBwKUr7DAA0uLBJnv3sE3CZ zaEVdjPvt62GA8DR3xj1IcHW5bMRyOVs9mrQKg2blrrZRtVWX1Zb3Vssny7B6a3lH1wN E2WLTPCbCDmIou4uQOoONZOwHIR3ToPMBk/PCvMPW+lxbxGbhB9YlDxd9u3O3GeOrti/ 44uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XN7i8sOpMipC40cVjppg9yu+Ps/zil9DAOK5KLDUw0M=; fh=JwN0p46ZlpvloRQl/55YovaDle/zmEWTwso8DKF8XUk=; b=eUs/oHUuMVFLEokshJfmNhQAo7xas816LRKJpTjP+rhqz26+a2lX4gnuMHCx75DB4N H/lBXWJqHVDt+q8nSE658iMS0ZgIS/DKjpzHCRPUFj1gm5p4Mm68Nh1Nf6gqriBT10Xc MVcrQWQXHEyoyNY5xKEm7uKLIbLI06Q8zyyZ1HGgXcp7kCkGsfLotABrgWi3xL3dYepJ 7iV2+tR29cXIlFdneLNBcxRVNwmFbSnX8e+Ii4Ffi7xkxlaGpUFv0v/FgbYn6vSo88K0 Tt2KiPMA5DsPRB+wVuGogVyFlZDU+FXiSPbU7ewz4y1MTuEBscAORpaNxijEx/3reCHl ZNvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@metaspace-dk.20221208.gappssmtp.com header.s=20221208 header.b=YnGaH5q+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p12-20020a170902f08c00b001b7eb86ae1asi18540079pla.204.2023.07.04.10.24.06; Tue, 04 Jul 2023 10:24:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@metaspace-dk.20221208.gappssmtp.com header.s=20221208 header.b=YnGaH5q+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231733AbjGDQw1 (ORCPT + 99 others); Tue, 4 Jul 2023 12:52:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231483AbjGDQwU (ORCPT ); Tue, 4 Jul 2023 12:52:20 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED95BE42 for ; Tue, 4 Jul 2023 09:52:18 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-51d946d2634so6912239a12.3 for ; Tue, 04 Jul 2023 09:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metaspace-dk.20221208.gappssmtp.com; s=20221208; t=1688489537; x=1691081537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XN7i8sOpMipC40cVjppg9yu+Ps/zil9DAOK5KLDUw0M=; b=YnGaH5q+0mIaDQVxcj8VDtedKRiYHSnb62uFMjDO2iLG4NGLiHnr37a9E/mkOlwqZO kgloe5K90mNkLAHoxxm2I/boPTp3Og+Q21xzBYrOhPZ4W1OH0zlmbMA1R4z9IGn7j6zb Gmoxe2x4OEcQCw1KRgL1BPGouhgFIy9UmxP8RqbYvWq4xHTuW0Ij+nz9bjjx+E2oQIWw Ihbu7uO3ua087o1mZ0W8ShexOzdxsWkljy3b2yTBwq+NwhL/J/hqXUKq/gfb7V0DZg+b CMJORX2P6hCknhGJNGt6vfSBBw/eINF8eKZyE14NSWhLwwM2dr0XozOc/efnuPu0foU/ 6bLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688489537; x=1691081537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XN7i8sOpMipC40cVjppg9yu+Ps/zil9DAOK5KLDUw0M=; b=HRvXJhaixa/rD+xadv0MbNICXMWwyrrt5zKiWEAJsT0vC/Q3affkjJJPPnSKmt1pzG r5HHrvGfkJ8rNspOhKzZWGt5b9+LolOGyaqX5MOCMbPfWxd8S25Gy5KCJvE+iXDQsTuh b83oP2WX9AAVkgJwX4iY1l3hkroVTfzQ9qgfCCYYSL/fsnGzzgNCgSIxS6SmCQyPKJ+w 0DnF3qjbq7JtEFcb79oBcXjlbN0N5uP+obEFjoqEZumpGGMZP2sbJsQXy+wGH/xST58B 4d8IZ+/9iREAAGuwo3lYyGEwzyAAkOWodOZh1iV+FvmZzs1o4alTOUSRRbp/L0w9AFJ9 ZaGg== X-Gm-Message-State: ABy/qLal8ZVYAX4Zm4TB70WHhak7fevd4YIEcqwo1y7wZC0QgPEBee5o xQVr7BfaKVAB45unFyPyXnhsIw== X-Received: by 2002:aa7:c489:0:b0:51d:eb90:4928 with SMTP id m9-20020aa7c489000000b0051deb904928mr10924266edq.30.1688489537566; Tue, 04 Jul 2023 09:52:17 -0700 (PDT) Received: from localhost ([79.142.230.34]) by smtp.gmail.com with ESMTPSA id g25-20020aa7c859000000b0050cc4461fc5sm11872717edt.92.2023.07.04.09.52.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 09:52:17 -0700 (PDT) From: Andreas Hindborg To: Ming Lei Cc: linux-kernel@vger.kernel.org (open list), Matias Bjorling , Hans Holmberg , Jens Axboe , Minwoo Im , Aravind Ramesh , gost.dev@samsung.com, linux-block@vger.kernel.org (open list:BLOCK LAYER), Christoph Hellwig , Damien Le Moal , Andreas Hindborg Subject: [PATCH v5 3/5] ublk: rename driver files to prepare for multiple translation units Date: Tue, 4 Jul 2023 18:52:07 +0200 Message-ID: <20230704165209.514591-4-nmi@metaspace.dk> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230704165209.514591-1-nmi@metaspace.dk> References: <20230704165209.514591-1-nmi@metaspace.dk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770511620058497519?= X-GMAIL-MSGID: =?utf-8?q?1770511620058497519?= From: Andreas Hindborg The zoned storage support for ublk adds a translation unit to the module. In order to be able to keep the existing name for the module, rename the currently only translation unit. Also rename the header to align with the C file name. Signed-off-by: Andreas Hindborg --- MAINTAINERS | 4 ++-- drivers/block/Makefile | 1 + drivers/block/{ublk_drv.c => ublk.c} | 2 +- drivers/block/{ublk_drv.h => ublk.h} | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename drivers/block/{ublk_drv.c => ublk.c} (99%) rename drivers/block/{ublk_drv.h => ublk.h} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ace71c90751c..1f193cd43958 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21553,8 +21553,8 @@ M: Ming Lei L: linux-block@vger.kernel.org S: Maintained F: Documentation/block/ublk.rst -F: drivers/block/ublk_drv.c -F: drivers/block/ublk_drv.h +F: drivers/block/ublk.c +F: drivers/block/ublk.h F: include/uapi/linux/ublk_cmd.h UCLINUX (M68KNOMMU AND COLDFIRE) diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 101612cba303..38f2229623a8 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -38,5 +38,6 @@ obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/ obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk/ obj-$(CONFIG_BLK_DEV_UBLK) += ublk_drv.o +ublk_drv-$(CONFIG_BLK_DEV_UBLK) += ublk.o swim_mod-y := swim.o swim_asm.o diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk.c similarity index 99% rename from drivers/block/ublk_drv.c rename to drivers/block/ublk.c index bca0c4e1cfd8..a0453619bf67 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk.c @@ -45,7 +45,7 @@ #include #include #include -#include "ublk_drv.h" +#include "ublk.h" #define UBLK_MINORS (1U << MINORBITS) diff --git a/drivers/block/ublk_drv.h b/drivers/block/ublk.h similarity index 100% rename from drivers/block/ublk_drv.h rename to drivers/block/ublk.h