On Tue, Apr 01, 2008 at 09:48:37PM -0400, Robert P. J. Day wrote: > > Also, sort the Kbuild file. Applied, thanks.--b. > > Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> > > --- > > include/linux/nfsd/Kbuild | 4 ++-- > include/linux/nfsd/cache.h | 2 -- > include/linux/nfsd/nfsd.h | 3 --- > 3 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild > index e726fc3..fc97204 100644 > --- a/include/linux/nfsd/Kbuild > +++ b/include/linux/nfsd/Kbuild > @@ -1,6 +1,6 @@ > unifdef-y += const.h > +unifdef-y += debug.h > unifdef-y += export.h > +unifdef-y += nfsfh.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 > --- a/include/linux/nfsd/cache.h > +++ b/include/linux/nfsd/cache.h > @@ -10,7 +10,6 @@ > #ifndef NFSCACHE_H > #define NFSCACHE_H > > -#ifdef __KERNEL__ > #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 *); > > -#endif /* __KERNEL__ */ > #endif /* NFSCACHE_H */ > diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h > index 8caf4c4..c17ef86 100644 > --- 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 > > -#ifdef __KERNEL__ > /* > * Special flags for nfsd_permission. These must be different from MAY_READ, > * MAY_WRITE, and MAY_EXEC. > @@ -326,6 +325,4 @@ extern struct timeval nfssvc_boot; > > #endif /* CONFIG_NFSD_V4 */ > > -#endif /* __KERNEL__ */ > - > #endif /* LINUX_NFSD_NFSD_H */ > > ======================================================================== > Robert P. J. Day > Linux Consulting, Training and Annoying Kernel Pedantry: > Have classroom, will lecture. > > http://crashcourse.ca Waterloo, Ontario, CANADA > ======================================================================== > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
