PCI: cpqphp: Cleanup and remove unreachable paths

[~andy/linux] / fs / nfsd / nfs4idmap.c

diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index fdc91a6fc9c4e3d50bea67386c463bd50d8c4c12..a1f10c0a62553d0642b02adc7a66bd7a60c0139c 100644 (file)
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -478,7 +478,7 @@ nfsd_idmap_init(struct net *net)
                goto destroy_idtoname_cache;
        nn->nametoid_cache = cache_create_net(&nametoid_cache_template, net);
        if (IS_ERR(nn->nametoid_cache)) {
-               rv = PTR_ERR(nn->idtoname_cache);
+               rv = PTR_ERR(nn->nametoid_cache);
                goto unregister_idtoname_cache;
        }
        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
        /* Just to make sure it's null-terminated: */
        memcpy(buf, name, namelen);
        buf[namelen] = '\0';
-       ret = kstrtouint(name, 10, id);
+       ret = kstrtouint(buf, 10, id);
        return ret == 0;
 }