Commit b5663898 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

nfsd: idmap use u32 not uid_t as the intermediate type 



u32 and uid_t have the same size and semantics so this change
should have no operational effect.  This just removes the WTF
factor when looking at variables that hold both uids and gids
whos type is uid_t.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 6c1810e0

fs/nfsd/nfs4idmap.c

+6 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ MODULE_PARM_DESC(nfs4_disable_idmapping, 
struct ent {

	struct cache_head h;

	int               type;		       /* User / Group */

	uid_t             id;

	u32               id;

	char              name[IDMAP_NAMESZ];

	char              authname[IDMAP_NAMESZ];

};
@@ -540,7 +540,7 @@ rqst_authname(struct svc_rqst *rqstp) 


static __be32

idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen,

		uid_t *id)

		u32 *id)

{

	struct ent *item, key = {

		.type = type,
@@ -564,7 +564,7 @@ idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen 
}



static int

idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name)

idmap_id_to_name(struct svc_rqst *rqstp, int type, u32 id, char *name)

{

	struct ent *item, key = {

		.id = id,
@@ -587,7 +587,7 @@ idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name) 
}



static bool

numeric_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen, uid_t *id)

numeric_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen, u32 *id)

{

	int ret;

	char buf[11];
@@ -603,7 +603,7 @@ numeric_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namel 
}



static __be32

do_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen, uid_t *id)

do_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen, u32 *id)

{

	if (nfs4_disable_idmapping && rqstp->rq_cred.cr_flavor < RPC_AUTH_GSS)

		if (numeric_name_to_id(rqstp, type, name, namelen, id))
@@ -616,7 +616,7 @@ do_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen, u 
}



static int

do_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name)

do_id_to_name(struct svc_rqst *rqstp, int type, u32 id, char *name)

{

	if (nfs4_disable_idmapping && rqstp->rq_cred.cr_flavor < RPC_AUTH_GSS)

		return sprintf(name, "%u", id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE