diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2015-07-03 19:36:14 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-07-20 14:58:46 -0400 |
| commit | e446d66dd77fa8fbb505a9940bf637649c9b45f2 (patch) | |
| tree | b228bc881158ce7f3593cf210ccd02ac1857577f | |
| parent | faf996a654ac60983a24a9cdc5e0f3324e8a2b32 (diff) | |
| download | op-kernel-dev-e446d66dd77fa8fbb505a9940bf637649c9b45f2.zip op-kernel-dev-e446d66dd77fa8fbb505a9940bf637649c9b45f2.tar.gz | |
nfsd: Remove duplicate define of IDMAP_NAMESZ/IDMAP_TYPE_xx
Just using the macro defined in nfs_idmap.h.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/idmap.h | 4 | ||||
| -rw-r--r-- | fs/nfsd/nfs4idmap.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfsd/idmap.h b/fs/nfsd/idmap.h index a3f3490..23cc85d 100644 --- a/fs/nfsd/idmap.h +++ b/fs/nfsd/idmap.h @@ -37,9 +37,7 @@ #include <linux/in.h> #include <linux/sunrpc/svc.h> - -/* XXX from linux/nfs_idmap.h */ -#define IDMAP_NAMESZ 128 +#include <linux/nfs_idmap.h> #ifdef CONFIG_NFSD_V4 int nfsd_idmap_init(struct net *); diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index e1b3d3d..5b20577 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c @@ -59,9 +59,6 @@ MODULE_PARM_DESC(nfs4_disable_idmapping, * that. */ -#define IDMAP_TYPE_USER 0 -#define IDMAP_TYPE_GROUP 1 - struct ent { struct cache_head h; int type; /* User / Group */ |
