diff options
| -rw-r--r-- | fs/nfsd/auth.h (renamed from include/linux/nfsd/auth.h) | 0 | ||||
| -rw-r--r-- | fs/nfsd/nfs3xdr.c | 1 | ||||
| -rw-r--r-- | fs/nfsd/nfsfh.c | 1 | ||||
| -rw-r--r-- | fs/nfsd/nfsxdr.c | 1 | ||||
| -rw-r--r-- | include/linux/nfsd/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/nfsd/nfsd.h | 1 | ||||
| -rw-r--r-- | include/linux/nfsd/syscall.h | 1 |
7 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/nfsd/auth.h b/fs/nfsd/auth.h index 0fb9f7212195..0fb9f7212195 100644 --- a/include/linux/nfsd/auth.h +++ b/fs/nfsd/auth.h | |||
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index be515c5a8154..4b1ffe3be7e2 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/sunrpc/svc.h> | 21 | #include <linux/sunrpc/svc.h> |
| 22 | #include <linux/nfsd/nfsd.h> | 22 | #include <linux/nfsd/nfsd.h> |
| 23 | #include <linux/nfsd/xdr3.h> | 23 | #include <linux/nfsd/xdr3.h> |
| 24 | #include "auth.h" | ||
| 24 | 25 | ||
| 25 | #define NFSDDBG_FACILITY NFSDDBG_XDR | 26 | #define NFSDDBG_FACILITY NFSDDBG_XDR |
| 26 | 27 | ||
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 468f17a78441..8fbd2dc08a92 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/sunrpc/svc.h> | 22 | #include <linux/sunrpc/svc.h> |
| 23 | #include <linux/sunrpc/svcauth_gss.h> | 23 | #include <linux/sunrpc/svcauth_gss.h> |
| 24 | #include <linux/nfsd/nfsd.h> | 24 | #include <linux/nfsd/nfsd.h> |
| 25 | #include "auth.h" | ||
| 25 | 26 | ||
| 26 | #define NFSDDBG_FACILITY NFSDDBG_FH | 27 | #define NFSDDBG_FACILITY NFSDDBG_FH |
| 27 | 28 | ||
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c index 7003c313272f..61ad61743d94 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/nfsd/nfsd.h> | 15 | #include <linux/nfsd/nfsd.h> |
| 16 | #include <linux/nfsd/xdr.h> | 16 | #include <linux/nfsd/xdr.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include "auth.h" | ||
| 18 | 19 | ||
| 19 | #define NFSDDBG_FACILITY NFSDDBG_XDR | 20 | #define NFSDDBG_FACILITY NFSDDBG_XDR |
| 20 | 21 | ||
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild index d9c5455808e5..e726fc3a4375 100644 --- a/include/linux/nfsd/Kbuild +++ b/include/linux/nfsd/Kbuild | |||
| @@ -4,4 +4,3 @@ unifdef-y += stats.h | |||
| 4 | unifdef-y += syscall.h | 4 | unifdef-y += syscall.h |
| 5 | unifdef-y += nfsfh.h | 5 | unifdef-y += nfsfh.h |
| 6 | unifdef-y += debug.h | 6 | unifdef-y += debug.h |
| 7 | unifdef-y += auth.h | ||
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index a51a30f30cee..8caf4c4f64e6 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/nfsd/debug.h> | 20 | #include <linux/nfsd/debug.h> |
| 21 | #include <linux/nfsd/nfsfh.h> | 21 | #include <linux/nfsd/nfsfh.h> |
| 22 | #include <linux/nfsd/export.h> | 22 | #include <linux/nfsd/export.h> |
| 23 | #include <linux/nfsd/auth.h> | ||
| 24 | #include <linux/nfsd/stats.h> | 23 | #include <linux/nfsd/stats.h> |
| 25 | /* | 24 | /* |
| 26 | * nfsd version | 25 | * nfsd version |
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 8bcddccb6c42..4e439765b705 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/nfsd/const.h> | 18 | #include <linux/nfsd/const.h> |
| 19 | #include <linux/nfsd/export.h> | 19 | #include <linux/nfsd/export.h> |
| 20 | #include <linux/nfsd/nfsfh.h> | 20 | #include <linux/nfsd/nfsfh.h> |
| 21 | #include <linux/nfsd/auth.h> | ||
| 22 | 21 | ||
| 23 | /* | 22 | /* |
| 24 | * Version of the syscall interface | 23 | * Version of the syscall interface |