Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5ae0398 authored Apr 01, 2008 by Robert P. J. Day Committed by J. Bruce Fields Apr 23, 2008

NFSD: Strip KERNEL testing from unexported header files.



Also, sort the Kbuild file.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

parent 4ab4b0be

include/linux/nfsd/Kbuild

+2 −2

Original line number	Original line	Diff line number	Diff line
	unifdef-y += const.h		unifdef-y += const.h
			unifdef-y += debug.h
	unifdef-y += export.h		unifdef-y += export.h
			unifdef-y += nfsfh.h
	unifdef-y += stats.h		unifdef-y += stats.h
	unifdef-y += syscall.h		unifdef-y += syscall.h
	unifdef-y += nfsfh.h
	unifdef-y += debug.h

include/linux/nfsd/cache.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,6 @@
	#ifndef NFSCACHE_H		#ifndef NFSCACHE_H
	#define NFSCACHE_H		#define NFSCACHE_H

	#ifdef __KERNEL__
	#include <linux/in.h>		#include <linux/in.h>
	#include <linux/uio.h>		#include <linux/uio.h>

	@@ -77,5 +76,4 @@ void nfsd_reply_cache_shutdown(void);
	int nfsd_cache_lookup(struct svc_rqst *, int);		int nfsd_cache_lookup(struct svc_rqst *, int);
	void nfsd_cache_update(struct svc_rqst , int, __be32 );		void nfsd_cache_update(struct svc_rqst , int, __be32 );

	#endif /* __KERNEL__ */
	#endif /* NFSCACHE_H */		#endif /* NFSCACHE_H */

include/linux/nfsd/nfsd.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@
	#define NFSD_VERSION "0.5"		#define NFSD_VERSION "0.5"
	#define NFSD_SUPPORTED_MINOR_VERSION 0		#define NFSD_SUPPORTED_MINOR_VERSION 0

	#ifdef __KERNEL__
	/*		/*
	* Special flags for nfsd_permission. These must be different from MAY_READ,		* Special flags for nfsd_permission. These must be different from MAY_READ,
	* MAY_WRITE, and MAY_EXEC.		* MAY_WRITE, and MAY_EXEC.
	@@ -334,6 +333,4 @@ extern struct timeval nfssvc_boot;

	#endif /* CONFIG_NFSD_V4 */		#endif /* CONFIG_NFSD_V4 */

	#endif /* __KERNEL__ */

	#endif /* LINUX_NFSD_NFSD_H */		#endif /* LINUX_NFSD_NFSD_H */