From patchwork Sat May 9 03:10:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 11537935 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F30D15E6 for ; Sat, 9 May 2020 03:11:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC7C524965 for ; Sat, 9 May 2020 03:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588993872; bh=usRgbrTRjA+FKLowvdMTcb4skuPnmzLrUtzuPbx03bU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xoQP3jiiDDHZtRYND4n+jOOcbeOeTWIfB8fvjL0XhhCn/wrUGbSl2dGVBz/st+diU IwmatIa5QMFoTjkPWa27myeSDT2QmFcohazuFPjW4U7E8ZpXEQfbK9KF/ATFbbMb1n zcH0RDbHDaYPX0rg6q/uKZjiQeLIBzu/rhgvC/wk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728776AbgEIDLL (ORCPT ); Fri, 8 May 2020 23:11:11 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36156 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728714AbgEIDLH (ORCPT ); Fri, 8 May 2020 23:11:07 -0400 Received: by mail-pl1-f196.google.com with SMTP id f15so1588509plr.3; Fri, 08 May 2020 20:11:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GsoZPFNxO+4hxSpvgE4DeJVl8mNmT5WoVOtsmVVbdVk=; b=AQKrbakrmXUXLDVBDwQNPARPmoAwemmjPUkT8bLSVJpzpiB6o18+MI3g4z09sqZJBe i7hm1itghEMKr9nlojRtSLcdvvtzXAbELUQJjYJZ13IgcSV/c7xi8E5WPLsfJZtmyDXk fgBDRBwOwe6i/iDlIRO9nNdciJLwH5NolZGBOxDF6sNuSYB9N52BhznFWc9Yj4VjQxDD wNo2QQ6rDh1l4DbcGA3m+Magv4wVIJJDZ6OwjfjMBr2nOCDEchV/JHRxaG1/9udnd9Dg VLEkMh+oERPLhKqYFbQK+EkwFTZUbfi9WJDz4/byfaoEaZsXQsfs8hkCpbPxni+0gRD/ tzEQ== X-Gm-Message-State: AGi0PuZWnyxirV/X0FCNtzDKYBlolchIOAouxi7HQ3gU6Fi1N4D/t2CT YIYBqJTqfRGeAfJtgIoy4Ow= X-Google-Smtp-Source: APiQypIjGBDDLRX5XOPh0RRN+PZ/cn6kVp6wDqUKRMqjvQKgal0TNIvxddybqbqILVcuM2mK1vF1CQ== X-Received: by 2002:a17:90a:77c6:: with SMTP id e6mr9324761pjs.84.1588993865942; Fri, 08 May 2020 20:11:05 -0700 (PDT) Received: from 42.do-not-panic.com (42.do-not-panic.com. [157.230.128.187]) by smtp.gmail.com with ESMTPSA id i10sm3183476pfa.166.2020.05.08.20.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 20:11:00 -0700 (PDT) Received: by 42.do-not-panic.com (Postfix, from userid 1000) id D7C7141405; Sat, 9 May 2020 03:10:59 +0000 (UTC) From: Luis Chamberlain To: axboe@kernel.dk, viro@zeniv.linux.org.uk, bvanassche@acm.org, gregkh@linuxfoundation.org, rostedt@goodmis.org, mingo@redhat.com, jack@suse.cz, ming.lei@redhat.com, nstange@suse.de, akpm@linux-foundation.org Cc: mhocko@suse.com, yukuai3@huawei.com, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Luis Chamberlain , Omar Sandoval , Hannes Reinecke , Michal Hocko , Christoph Hellwig Subject: [PATCH v4 2/5] block: move main block debugfs initialization to its own file Date: Sat, 9 May 2020 03:10:55 +0000 Message-Id: <20200509031058.8239-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20200509031058.8239-1-mcgrof@kernel.org> References: <20200509031058.8239-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org make_request-based drivers and and request-based drivers share some debugfs code. By moving this into its own file it makes it easier to expand and audit this shared code. This patch contains no functional changes. Cc: Bart Van Assche Cc: Omar Sandoval Cc: Hannes Reinecke Cc: Nicolai Stange Cc: Greg Kroah-Hartman Cc: Michal Hocko Cc: yu kuai Reviewed-by: Christoph Hellwig Reviewed-by: Greg Kroah-Hartman Reviewed-by: Bart Van Assche Signed-off-by: Luis Chamberlain --- block/Makefile | 1 + block/blk-core.c | 9 +-------- block/blk-debugfs.c | 15 +++++++++++++++ block/blk.h | 7 +++++++ 4 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 block/blk-debugfs.c diff --git a/block/Makefile b/block/Makefile index 206b96e9387f..1d3ab20505d8 100644 --- a/block/Makefile +++ b/block/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \ blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \ genhd.o ioprio.o badblocks.o partitions/ blk-rq-qos.o +obj-$(CONFIG_DEBUG_FS) += blk-debugfs.o obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_ioctl.o obj-$(CONFIG_BLK_DEV_BSG) += bsg.o diff --git a/block/blk-core.c b/block/blk-core.c index da120fd257fa..0a34b299275e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -49,10 +49,6 @@ #include "blk-pm.h" #include "blk-rq-qos.h" -#ifdef CONFIG_DEBUG_FS -struct dentry *blk_debugfs_root; -#endif - EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); @@ -1813,10 +1809,7 @@ int __init blk_dev_init(void) blk_requestq_cachep = kmem_cache_create("request_queue", sizeof(struct request_queue), 0, SLAB_PANIC, NULL); - -#ifdef CONFIG_DEBUG_FS - blk_debugfs_root = debugfs_create_dir("block", NULL); -#endif + blk_debugfs_register(); return 0; } diff --git a/block/blk-debugfs.c b/block/blk-debugfs.c new file mode 100644 index 000000000000..19091e1effc0 --- /dev/null +++ b/block/blk-debugfs.c @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Shared request-based / make_request-based functionality + */ +#include +#include +#include + +struct dentry *blk_debugfs_root; + +void blk_debugfs_register(void) +{ + blk_debugfs_root = debugfs_create_dir("block", NULL); +} diff --git a/block/blk.h b/block/blk.h index 73bd3b1c6938..ec16e8a6049e 100644 --- a/block/blk.h +++ b/block/blk.h @@ -456,5 +456,12 @@ struct request_queue *__blk_alloc_queue(int node_id); int __bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page *page, unsigned int len, unsigned int offset, bool *same_page); +#ifdef CONFIG_DEBUG_FS +void blk_debugfs_register(void); +#else +static inline void blk_debugfs_register(void) +{ +} +#endif /* CONFIG_DEBUG_FS */ #endif /* BLK_INTERNAL_H */