From patchwork Sat Dec 12 21:30:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 7837441 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 08B86BEEE1 for ; Sat, 12 Dec 2015 21:32:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FC7B20397 for ; Sat, 12 Dec 2015 21:32:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 225C32024D for ; Sat, 12 Dec 2015 21:32:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523AbbLLVca (ORCPT ); Sat, 12 Dec 2015 16:32:30 -0500 Received: from mail1.windriver.com ([147.11.146.13]:54001 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753407AbbLLVc3 (ORCPT ); Sat, 12 Dec 2015 16:32:29 -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 tBCLUZw2001120 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sat, 12 Dec 2015 13:30:36 -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:34 -0800 From: Paul Gortmaker To: CC: Paul Gortmaker , Alexander Viro , Jeff Layton , "J. Bruce Fields" , Subject: [PATCH 03/10] fs: make fcntl.c explicitly non-modular Date: Sat, 12 Dec 2015 16:30:05 -0500 Message-ID: <1449955812-10149-4-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 is obj-y 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. We don't replace module.h with init.h since the file already has that. Cc: Alexander Viro Cc: Jeff Layton Cc: "J. Bruce Fields" Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Paul Gortmaker --- fs/fcntl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/fcntl.c b/fs/fcntl.c index ee85cd4e136a..b485864eb357 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -755,5 +754,4 @@ static int __init fcntl_init(void) sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL); return 0; } - -module_init(fcntl_init) +fs_initcall(fcntl_init)