From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911AbbLLVap (ORCPT ); Sat, 12 Dec 2015 16:30:45 -0500 Received: from mail1.windriver.com ([147.11.146.13]:54005 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751640AbbLLVak (ORCPT ); Sat, 12 Dec 2015 16:30:40 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Alexander Viro , Subject: [PATCH 06/10] fs: make direct-io.c explicitly non-modular Date: Sat, 12 Dec 2015 16:30:08 -0500 Message-ID: <1449955812-10149-7-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1449955812-10149-1-git-send-email-paul.gortmaker@windriver.com> References: <1449955812-10149-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Makefile currently controlling compilation of this code has: ifeq ($(CONFIG_BLOCK),y) obj-y += buffer.o block_dev.o direct-io.o mpage.o and in addition to that the Kconfig is: block/Kconfig:menuconfig BLOCK block/Kconfig: bool "Enable the block layer" if EXPERT ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modularity so that when reading the code there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering gets bumped to one level earlier when we use the more appropriate fs_initcall here. However we've made similar changes before without any fallout and none is expected here either. Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker --- fs/direct-io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/direct-io.c b/fs/direct-io.c index 602e8441bc0f..a7d7b466f00e 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include @@ -1349,4 +1349,4 @@ static __init int dio_init(void) dio_cache = KMEM_CACHE(dio, SLAB_PANIC); return 0; } -module_init(dio_init) +fs_initcall(dio_init) -- 2.6.1