p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Kinglong Mee 2015-07-03 19:36:14 +08:00 committed by J. Bruce Fields
parent faf996a654
commit e446d66dd7
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/idmap.h
View File

@ -37,9 +37,7 @@
#include <linux/in.h> #include <linux/in.h>
#include <linux/sunrpc/svc.h> #include <linux/sunrpc/svc.h>
#include <linux/nfs_idmap.h>
/* XXX from linux/nfs_idmap.h */
#define IDMAP_NAMESZ 128
#ifdef CONFIG_NFSD_V4 #ifdef CONFIG_NFSD_V4
int nfsd_idmap_init(struct net *); int nfsd_idmap_init(struct net *);

3
fs/nfsd/nfs4idmap.c
View File

@ -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 ent {
struct cache_head h; struct cache_head h;
int type; /* User / Group */ int type; /* User / Group */