fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 25 Aug 2012 19:57:04 +0000 (21:57 +0200)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Sep 2012 21:46:17 +0000 (17:46 -0400)
Change the call to PTR_ERR to access the value just tested by IS_ERR.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e,e1;
@@

(
if (IS_ERR(e)) { ... PTR_ERR(e) ... }
|
if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... }
|
*if (IS_ERR(e))
 { ...
*  PTR_ERR(e1)
   ... }
)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4idmap.c

index fdc91a6fc9c4e3d50bea67386c463bd50d8c4c12..11df4aca89baef8d7c331a65ed21295db89b767c 100644 (file)
@@ -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);