From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-fsdevel-owner@vger.kernel.org>
Received: from mail-qg0-f42.google.com ([209.85.192.42]:34409 "EHLO
	mail-qg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751794AbbLRMHO (ORCPT
	<rfc822;linux-fsdevel@vger.kernel.org>);
	Fri, 18 Dec 2015 07:07:14 -0500
Received: by mail-qg0-f42.google.com with SMTP id p62so818207qge.1
        for <linux-fsdevel@vger.kernel.org>; Fri, 18 Dec 2015 04:07:14 -0800 (PST)
Date: Fri, 18 Dec 2015 07:07:10 -0500
From: Jeff Layton <jlayton@poochiereds.net>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: <linux-kernel@vger.kernel.org>,
	"J. Bruce Fields" <bfields@fieldses.org>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	<linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH 5/8] fs: make locks.c explicitly non-modular
Message-ID: <20151218070710.00511173@tlielax.poochiereds.net>
In-Reply-To: <1450379466-23115-6-git-send-email-paul.gortmaker@windriver.com>
References: <1450379466-23115-1-git-send-email-paul.gortmaker@windriver.com>
	<1450379466-23115-6-git-send-email-paul.gortmaker@windriver.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-fsdevel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>

On Thu, 17 Dec 2015 14:11:03 -0500
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:

> The Kconfig currently controlling compilation of this code is:
> 
> config FILE_LOCKING
>      bool "Enable POSIX file locking API" 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
> driver 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: Jeff Layton <jlayton@poochiereds.net>
> Acked-by: Jeff Layton <jlayton@poochiereds.net>
> Cc: "J. Bruce Fields" <bfields@fieldses.org>
> Cc: Alexander Viro <viro@zeniv.linux.org.uk>
> Cc: linux-fsdevel@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>  fs/locks.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/locks.c b/fs/locks.c
> index 0d2b3267e2a3..869b64418a5b 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -119,7 +119,6 @@
>  #include <linux/fdtable.h>
>  #include <linux/fs.h>
>  #include <linux/init.h>
> -#include <linux/module.h>
>  #include <linux/security.h>
>  #include <linux/slab.h>
>  #include <linux/syscalls.h>
> @@ -2706,7 +2705,7 @@ static int __init proc_locks_init(void)
>  	proc_create("locks", 0, NULL, &proc_locks_operations);
>  	return 0;
>  }
> -module_init(proc_locks_init);
> +fs_initcall(proc_locks_init);
>  #endif
>  
>  static int __init filelock_init(void)

Thanks Paul, I'll pick this one up for v4.5.
-- 
Jeff Layton <jlayton@poochiereds.net>