From patchwork Sat Dec 12 21:30:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 7837401 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B66A9F1C2 for ; Sat, 12 Dec 2015 21:31:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B37DC202B4 for ; Sat, 12 Dec 2015 21:31:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B43D92024D for ; Sat, 12 Dec 2015 21:31:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbbLLVam (ORCPT ); Sat, 12 Dec 2015 16:30:42 -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 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id tBCLUeF5001123 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sat, 12 Dec 2015 13:30:40 -0800 (PST) Received: from yow-lpgnfs-02.corp.ad.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.248.2; Sat, 12 Dec 2015 13:30:39 -0800 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 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)