Commit 7f1cbe51 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

[PATCH] headers_check: reduce user-visible noise in <linux/nfs_fs.h> 



We don't need any of this crap included from the user-visible part of nfs_fs.h
-- remove it all.

In fact, we probably don't need anything but NFS_SUPER_MAGIC to be defined; is
there any need for anything else?  And magic numbers should probably move to
<linux/magic.h> rather than being strewn across various fs-specific include
files which exist in userspace for solely that purpose.

With this patch, 'make header_check' works again at least on PowerPC.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d5e064a6

include/linux/nfs_fs.h

+26 −26
Original line number Diff line number Diff line
@@ -9,27 +9,6 @@ 
#ifndef _LINUX_NFS_FS_H

#define _LINUX_NFS_FS_H



#include <linux/in.h>

#include <linux/mm.h>

#include <linux/pagemap.h>

#include <linux/rwsem.h>

#include <linux/wait.h>



#include <linux/sunrpc/debug.h>

#include <linux/sunrpc/auth.h>

#include <linux/sunrpc/clnt.h>



#include <linux/nfs.h>

#include <linux/nfs2.h>

#include <linux/nfs3.h>

#include <linux/nfs4.h>

#include <linux/nfs_xdr.h>



#include <linux/nfs_fs_sb.h>



#include <linux/rwsem.h>

#include <linux/mempool.h>



/*

 * Enable debugging support for nfs client.

 * Requires RPC_DEBUG.
@@ -47,11 +26,6 @@ 
 */

#define NFS_SUPER_MAGIC			0x6969



/*

 * These are the default flags for swap requests

 */

#define NFS_RPC_SWAPFLAGS		(RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)



/*

 * When flushing a cluster of dirty pages, there can be different

 * strategies:
@@ -65,6 +39,32 @@ 


#ifdef __KERNEL__



#include <linux/in.h>

#include <linux/mm.h>

#include <linux/pagemap.h>

#include <linux/rwsem.h>

#include <linux/wait.h>



#include <linux/sunrpc/debug.h>

#include <linux/sunrpc/auth.h>

#include <linux/sunrpc/clnt.h>



#include <linux/nfs.h>

#include <linux/nfs2.h>

#include <linux/nfs3.h>

#include <linux/nfs4.h>

#include <linux/nfs_xdr.h>



#include <linux/nfs_fs_sb.h>



#include <linux/rwsem.h>

#include <linux/mempool.h>



/*

 * These are the default flags for swap requests

 */

#define NFS_RPC_SWAPFLAGS		(RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)



/*

 * NFSv3/v4 Access mode cache entry

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE