On Fri, Dec 12, 2014 at 10:50 AM, Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> wrote: > On Fri, Dec 12, 2014 at 9:58 AM, Jeff Layton <jlayton@xxxxxxxxxxxxxxx> wrote: >> On Fri, 12 Dec 2014 09:50:18 -0500 >> Jeff Layton <jlayton@xxxxxxxxxxxxxxx> wrote: >> >>> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx> >>> Cc: Thomas Haynes <thomas.haynes@xxxxxxxxxxxxxxx> >>> --- >>> fs/nfs/internal.h | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h >>> index efaa31c70fbe..ffef459f0b4f 100644 >>> --- a/fs/nfs/internal.h >>> +++ b/fs/nfs/internal.h >>> @@ -1,6 +1,8 @@ >>> /* >>> * NFS internal definitions >>> */ >>> +#ifndef __FS_NFS_INTERNAL_H >> >> Gyah...sorry for the whitespace typo above. Want me to resend with that >> tab turned into a space? > > That's OK. I'll manage somehow :-) > >>> +#define __FS_NFS_INTERNAL_H >>> >>> #include "nfs4_fs.h" >>> #include <linux/mount.h> >>> @@ -629,3 +631,5 @@ static inline u32 nfs_fhandle_hash(const struct nfs_fh *fh) >>> return 0; >>> } >>> #endif >>> + >>> +#endif /* __FS_NFS_INTERNAL_H */ >> >> >> -- >> Jeff Layton <jlayton@xxxxxxxxxxxxxxx> > So, having rethought this a little, I think I'd prefer to keep the current status. Right now, we catch all instances of someone incorrectly including this file in another header by virtue of the fact that the duplicate include will cause a compile error. -- Trond Myklebust Linux NFS client maintainer, PrimaryData trond.myklebust@xxxxxxxxxxxxxxx -- 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