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>

diff --git a/fs/nfsd/idmap.h b/fs/nfsd/idmap.h
index a3f34900091f492d28132c6cf1c90a4c836b7efe..23cc85d1efdd63d91e4d9e7aa4dfce387b22acdf 100644 (file)
--- a/fs/nfsd/idmap.h
+++ b/fs/nfsd/idmap.h
@@ -37,9 +37,7 @@
 
 #include <linux/in.h>
 #include <linux/sunrpc/svc.h>
 
 #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 *);
 
 #ifdef CONFIG_NFSD_V4
 int nfsd_idmap_init(struct net *);

diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index e1b3d3d472da70d08f4392b01e206a0224d54767..5b20577dcdd233162d8030003758274d7619d038 100644 (file)
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -59,9 +59,6 @@ MODULE_PARM_DESC(nfs4_disable_idmapping,
  * that.
  */
 
  * that.
  */
 

-#define IDMAP_TYPE_USER  0
-#define IDMAP_TYPE_GROUP 1
-

 struct ent {
        struct cache_head h;
        int               type;                /* User / Group */
 struct ent {
        struct cache_head h;
        int               type;                /* User / Group */