diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2011-01-04 17:37:15 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-01-04 18:22:09 -0500 |
| commit | 2ca72e17e5acb1052c35c9faba609c2289ce7a92 (patch) | |
| tree | fc93ed7824a22a9492f408a2f2143ac795afc741 | |
| parent | nfsd4: name->id mapping should fail with BADOWNER not BADNAME (diff) | |
| download | linux-dev-2ca72e17e5acb1052c35c9faba609c2289ce7a92.tar.xz linux-dev-2ca72e17e5acb1052c35c9faba609c2289ce7a92.zip | |
nfsd4: move idmap and acl header files into fs/nfsd
These are internal nfsd interfaces.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/acl.h (renamed from include/linux/nfs4_acl.h) | 0 | ||||
| -rw-r--r-- | fs/nfsd/idmap.h (renamed from include/linux/nfsd_idmap.h) | 0 | ||||
| -rw-r--r-- | fs/nfsd/nfs4acl.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfs4idmap.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 5 | ||||
| -rw-r--r-- | fs/nfsd/nfsctl.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 4 |
7 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/nfs4_acl.h b/fs/nfsd/acl.h index c9c05a78e9bb..c9c05a78e9bb 100644 --- a/include/linux/nfs4_acl.h +++ b/fs/nfsd/acl.h diff --git a/include/linux/nfsd_idmap.h b/fs/nfsd/idmap.h index d4a2ac18bd4c..d4a2ac18bd4c 100644 --- a/include/linux/nfsd_idmap.h +++ b/fs/nfsd/idmap.h diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index e48052615159..ad88f1c0a4c3 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c @@ -36,7 +36,7 @@ #include <linux/slab.h> #include <linux/nfs_fs.h> -#include <linux/nfs4_acl.h> +#include "acl.h" /* mode bit translations: */ diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index 844960fd0395..cbd599732765 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c @@ -33,10 +33,10 @@ */ #include <linux/module.h> -#include <linux/nfsd_idmap.h> #include <linux/seq_file.h> #include <linux/sched.h> #include <linux/slab.h> +#include "idmap.h" /* * Cache entry diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 364aae7d5998..2a0814d0ab1a 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -44,13 +44,14 @@ #include <linux/namei.h> #include <linux/statfs.h> #include <linux/utsname.h> -#include <linux/nfsd_idmap.h> -#include <linux/nfs4_acl.h> #include <linux/sunrpc/svcauth_gss.h> +#include "idmap.h" +#include "acl.h" #include "xdr4.h" #include "vfs.h" + #define NFSDDBG_FACILITY NFSDDBG_XDR /* diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 6840ec3ceecf..33b3e2b06779 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -8,12 +8,12 @@ #include <linux/namei.h> #include <linux/ctype.h> -#include <linux/nfsd_idmap.h> #include <linux/sunrpc/svcsock.h> #include <linux/nfsd/syscall.h> #include <linux/lockd/lockd.h> #include <linux/sunrpc/clnt.h> +#include "idmap.h" #include "nfsd.h" #include "cache.h" diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6a3af2ff3afe..b991125ce4a5 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -35,8 +35,8 @@ #endif /* CONFIG_NFSD_V3 */ #ifdef CONFIG_NFSD_V4 -#include <linux/nfs4_acl.h> -#include <linux/nfsd_idmap.h> +#include "acl.h" +#include "idmap.h" #endif /* CONFIG_NFSD_V4 */ #include "nfsd.h" |