| Message ID | 1312810169.2591.1153.camel@deadeye (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 08, 2011 at 02:29:29PM +0100, Ben Hutchings wrote: > <linux/nfsd/syscall.h> uses the NFS_MAXPATHLEN and NFS_FHSIZE macros > defined in <linux/nfs.h>, and struct knfsd_fh defined in > <linux/nfsd/nfsfh.h>. Well, the real bug is that this file exists at all. Neil sent this http://marc.info/?l=linux-nfs&m=130881392416899&w=2 in a while ago but I didn't want to attempt to merge something that touched every arch directory. I wonder what we should do.... --b. > > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> > --- > include/linux/nfsd/syscall.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h > index 812bc1e..07b75f2 100644 > --- a/include/linux/nfsd/syscall.h > +++ b/include/linux/nfsd/syscall.h > @@ -10,7 +10,9 @@ > #define NFSD_SYSCALL_H > > #include <linux/types.h> > +#include <linux/nfs.h> > #include <linux/nfsd/export.h> > +#include <linux/nfsd/nfsfh.h> > > /* > * Version of the syscall interface > -- > 1.7.5.4 > > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 08, 2011 at 11:55:38AM -0400, J. Bruce Fields wrote: > On Mon, Aug 08, 2011 at 02:29:29PM +0100, Ben Hutchings wrote: > > <linux/nfsd/syscall.h> uses the NFS_MAXPATHLEN and NFS_FHSIZE macros > > defined in <linux/nfs.h>, and struct knfsd_fh defined in > > <linux/nfsd/nfsfh.h>. > > Well, the real bug is that this file exists at all. OK. I've been more-or-less mechanically fixing headers and I don't have any particular expectations of this one. > Neil sent this > http://marc.info/?l=linux-nfs&m=130881392416899&w=2 in a while ago but I > didn't want to attempt to merge something that touched every arch > directory. I wonder what we should do.... [...] So long as it's cc'd to linux-arch and linux-kernel, I don't think that's going to be a problem. Yes it might conflict, but Linus (and sfr) can cope with such conflicts. Ben.
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 812bc1e..07b75f2 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h @@ -10,7 +10,9 @@ #define NFSD_SYSCALL_H #include <linux/types.h> +#include <linux/nfs.h> #include <linux/nfsd/export.h> +#include <linux/nfsd/nfsfh.h> /* * Version of the syscall interface
<linux/nfsd/syscall.h> uses the NFS_MAXPATHLEN and NFS_FHSIZE macros defined in <linux/nfs.h>, and struct knfsd_fh defined in <linux/nfsd/nfsfh.h>. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- include/linux/nfsd/syscall.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)