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>

diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
index e726fc3..fc97204 100644 (file)
--- a/include/linux/nfsd/Kbuild
+++ b/include/linux/nfsd/Kbuild
@@ -1,6 +1,6 @@
 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 += syscall.h
 unifdef-y += stats.h
 unifdef-y += syscall.h

-unifdef-y += nfsfh.h
-unifdef-y += debug.h

diff --git a/include/linux/nfsd/cache.h b/include/linux/nfsd/cache.h
index 7b5d784..04b355c 100644 (file)
--- a/include/linux/nfsd/cache.h
+++ b/include/linux/nfsd/cache.h
@@ -10,7 +10,6 @@
 #ifndef NFSCACHE_H
 #define NFSCACHE_H
 
 #ifndef NFSCACHE_H
 #define NFSCACHE_H
 

-#ifdef __KERNEL__

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


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

-#endif /* __KERNEL__ */

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

diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index f4de14d..21ee440 100644 (file)
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -27,7 +27,6 @@
 #define NFSD_VERSION           "0.5"
 #define NFSD_SUPPORTED_MINOR_VERSION   0
 
 #define NFSD_VERSION           "0.5"
 #define NFSD_SUPPORTED_MINOR_VERSION   0
 

-#ifdef __KERNEL__

 /*
  * Special flags for nfsd_permission. These must be different from MAY_READ,
  * MAY_WRITE, and MAY_EXEC.
 /*
  * Special flags for nfsd_permission. These must be different from MAY_READ,
  * 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 */