From patchwork Sat Dec 12 21:30:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 7837431 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 67AE29F1C2 for ; Sat, 12 Dec 2015 21:32:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7825E202B4 for ; Sat, 12 Dec 2015 21:32:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8433B2024D for ; Sat, 12 Dec 2015 21:32:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752941AbbLLVb4 (ORCPT ); Sat, 12 Dec 2015 16:31:56 -0500 Received: from mail5.windriver.com ([192.103.53.11]:37541 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752583AbbLLVai (ORCPT ); Sat, 12 Dec 2015 16:30:38 -0500 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id tBCLUbMu022233 (version=TLSv1 cipher=AES128-SHA bits=128 verify=OK); Sat, 12 Dec 2015 13:30:37 -0800 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:36 -0800 From: Paul Gortmaker To: CC: Paul Gortmaker , Alexander Viro , Subject: [PATCH 04/10] fs: make filesystems.c explicitly non-modular Date: Sat, 12 Dec 2015 16:30:06 -0500 Message-ID: <1449955812-10149-5-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=ham 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 is obj-y meaning that it currently is not being built as a module by anyone. Lets remove the traces of modularity that we can 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. We can't remove module.h from the file as we've done in similar cleanups, since other code in the file is using module functions to try and load filesystem drivers etc. Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker --- fs/filesystems.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/filesystems.c b/fs/filesystems.c index 5797d45a78cb..3bca451b1e80 100644 --- a/fs/filesystems.c +++ b/fs/filesystems.c @@ -253,7 +253,7 @@ static int __init proc_filesystems_init(void) proc_create("filesystems", 0, NULL, &filesystems_proc_fops); return 0; } -module_init(proc_filesystems_init); +fs_initcall(proc_filesystems_init); #endif static struct file_system_type *__get_fs_type(const char *name, int len)