diff options
| author | Neil Brown <neilb@cse.unsw.edu.au> | 2002-09-12 01:40:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-12 01:40:13 -0700 |
| commit | 8a5d34f39da5a0806e5cbbc5550e5a04bb5c18ba (patch) | |
| tree | 3b722bfbb0cdefb6adfad3453f7306bd28906435 | |
| parent | 151ddf2e384fa2d19d72ecf2f18c74d9ceb07fa2 (diff) | |
[PATCH] kNFSd 4: Discard svc_uidmap structure
It is un-used and never will be. uid mapping will be done a
different way (if at all).
| -rw-r--r-- | fs/nfsd/export.c | 1 | ||||
| -rw-r--r-- | include/linux/nfsd/auth.h | 18 | ||||
| -rw-r--r-- | include/linux/nfsd/export.h | 1 |
3 files changed, 0 insertions, 20 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index c45b67a2a65b..4f8a9da439a1 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -838,7 +838,6 @@ exp_freeclient(svc_client *clp) { exp_unhashclient(clp); - /* umap_free(&(clp->cl_umap)); */ exp_unexport_all(clp); kfree (clp); } diff --git a/include/linux/nfsd/auth.h b/include/linux/nfsd/auth.h index ec2c9d7bfb26..575a0c0fea2a 100644 --- a/include/linux/nfsd/auth.h +++ b/include/linux/nfsd/auth.h @@ -23,23 +23,5 @@ */ void nfsd_setuser(struct svc_rqst *, struct svc_export *); -#if 0 -/* - * These must match the actual size of uid_t and gid_t - */ -#define UGID_BITS (8 * sizeof(uid_t)) -#define UGID_SHIFT 8 -#define UGID_MASK ((1 << UGID_SHIFT) - 1) -#define UGID_NRENTRIES ((1 << (UGID_BITS - UGID_SHIFT)) + 1) -#define UGID_NONE ((unsigned short)-1) - -typedef struct svc_uidmap { - uid_t * um_ruid[UGID_NRENTRIES]; - uid_t * um_luid[UGID_NRENTRIES]; - gid_t * um_rgid[UGID_NRENTRIES]; - gid_t * um_lgid[UGID_NRENTRIES]; -} svc_uidmap; -#endif - #endif /* __KERNEL__ */ #endif /* LINUX_NFSD_AUTH_H */ diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index a5c23140778b..a8968f9a106f 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h @@ -54,7 +54,6 @@ struct svc_client { int cl_idlen; int cl_naddr; struct in_addr cl_addr[NFSCLNT_ADDRMAX]; - struct svc_uidmap * cl_umap; struct list_head cl_export[NFSCLNT_EXPMAX]; struct list_head cl_expfsid[NFSCLNT_EXPMAX]; struct list_head cl_list; |