diff options
Diffstat (limited to 'fs/nfsd/nfs4idmap.c')
-rw-r--r-- | fs/nfsd/nfs4idmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index fdc91a6fc9c4..a1f10c0a6255 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c | |||
@@ -478,7 +478,7 @@ nfsd_idmap_init(struct net *net) | |||
478 | goto destroy_idtoname_cache; | 478 | goto destroy_idtoname_cache; |
479 | nn->nametoid_cache = cache_create_net(&nametoid_cache_template, net); | 479 | nn->nametoid_cache = cache_create_net(&nametoid_cache_template, net); |
480 | if (IS_ERR(nn->nametoid_cache)) { | 480 | if (IS_ERR(nn->nametoid_cache)) { |
481 | rv = PTR_ERR(nn->idtoname_cache); | 481 | rv = PTR_ERR(nn->nametoid_cache); |
482 | goto unregister_idtoname_cache; | 482 | goto unregister_idtoname_cache; |
483 | } | 483 | } |
484 | rv = cache_register_net(nn->nametoid_cache, net); | 484 | rv = cache_register_net(nn->nametoid_cache, net); |
@@ -598,7 +598,7 @@ numeric_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namel | |||
598 | /* Just to make sure it's null-terminated: */ | 598 | /* Just to make sure it's null-terminated: */ |
599 | memcpy(buf, name, namelen); | 599 | memcpy(buf, name, namelen); |
600 | buf[namelen] = '\0'; | 600 | buf[namelen] = '\0'; |
601 | ret = kstrtouint(name, 10, id); | 601 | ret = kstrtouint(buf, 10, id); |
602 | return ret == 0; | 602 | return ret == 0; |
603 | } | 603 | } |
604 | 604 | ||