The patch titled headers_check: reduce user-visible noise in <linux/nfs_fs.h> has been added to the -mm tree. Its filename is headers_check-reduce-user-visible-noise-in-linux-nfs_fsh.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: headers_check: reduce user-visible noise in <linux/nfs_fs.h> From: David Woodhouse <dwmw2@xxxxxxxxxxxxx> 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: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/nfs_fs.h | 50 +++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff -puN include/linux/nfs_fs.h~headers_check-reduce-user-visible-noise-in-linux-nfs_fsh include/linux/nfs_fs.h --- a/include/linux/nfs_fs.h~headers_check-reduce-user-visible-noise-in-linux-nfs_fsh +++ a/include/linux/nfs_fs.h @@ -9,6 +9,31 @@ #ifndef _LINUX_NFS_FS_H #define _LINUX_NFS_FS_H +/* + * Enable debugging support for nfs client. + * Requires RPC_DEBUG. + */ +#ifdef RPC_DEBUG +# define NFS_DEBUG +#endif + +/* Default timeout values */ +#define NFS_MAX_UDP_TIMEOUT (60*HZ) +#define NFS_MAX_TCP_TIMEOUT (600*HZ) + +/* + * When flushing a cluster of dirty pages, there can be different + * strategies: + */ +#define FLUSH_SYNC 1 /* file being synced, or contention */ +#define FLUSH_STABLE 4 /* commit to stable storage */ +#define FLUSH_LOWPRI 8 /* low priority background flush */ +#define FLUSH_HIGHPRI 16 /* high priority memory reclaim flush */ +#define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ +#define FLUSH_INVALIDATE 64 /* Invalidate the page cache */ + +#ifdef __KERNEL__ + #include <linux/in.h> #include <linux/mm.h> #include <linux/pagemap.h> @@ -34,36 +59,11 @@ #include <linux/fscache.h> /* - * Enable debugging support for nfs client. - * Requires RPC_DEBUG. - */ -#ifdef RPC_DEBUG -# define NFS_DEBUG -#endif - -/* Default timeout values */ -#define NFS_MAX_UDP_TIMEOUT (60*HZ) -#define NFS_MAX_TCP_TIMEOUT (600*HZ) - -/* * 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: - */ -#define FLUSH_SYNC 1 /* file being synced, or contention */ -#define FLUSH_STABLE 4 /* commit to stable storage */ -#define FLUSH_LOWPRI 8 /* low priority background flush */ -#define FLUSH_HIGHPRI 16 /* high priority memory reclaim flush */ -#define FLUSH_NOCOMMIT 32 /* Don't send the NFSv3/v4 COMMIT */ -#define FLUSH_INVALIDATE 64 /* Invalidate the page cache */ - -#ifdef __KERNEL__ - -/* * NFSv3/v4 Access mode cache entry */ struct nfs_access_entry { _ Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are origin.patch git-gfs2.patch git-mtd.patch mtd-maps-ixp4xx-partition-parsing.patch fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch mtd-printk-format-warning.patch fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch drivers-mtd-nand-au1550ndc-removal-of-old-code.patch fs-conversions-from-kmallocmemset-to-kzcalloc.patch headers_check-improve-include-regexp.patch headers_check-clarify-error-message.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch headers_check-reduce-user-visible-noise-in-linux-nfs_fsh.patch headers_check-remove-asm-timexh-from-user-export.patch headers_check-move-inclusion-of-linux-linkageh-in.patch headers_check-move-kernel-only-includes-within-asm-i386-elfh.patch headers_check-dont-expose-pfn-stuff-to-userspace-in.patch headers_check-fix-userspace-build-of-asm-mips-pageh.patch debug-shared-irqs.patch debug-shared-irqs-kconfig-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html