summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-03-12 19:33:00 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-12 20:51:42 +0400
commit11588f493a2441f09ceb2088d07cc012b53cbf75 (patch)
treef1f0f598ee239edd9e423bc745d1be77641ce36c
parent4b7c8dd205d6df1629ccde9f6dcf6a85d34c37ff (diff)
downloadlinux-11588f493a2441f09ceb2088d07cc012b53cbf75.tar.xz
NFS: Check return value from rpc_queue_upcall()
This function could fail to queue the upcall if rpc.idmapd is not running, causing a warning message to be printed. Instead, I want to check the return value and revoke the key if the upcall can't be run. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/idmap.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index f9f89fc83ee0..a701a83047d3 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -656,14 +656,19 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons,
idmap->idmap_key_cons = cons;
- return rpc_queue_upcall(idmap->idmap_pipe, msg);
+ ret = rpc_queue_upcall(idmap->idmap_pipe, msg);
+ if (ret < 0)
+ goto out2;
+
+ return ret;
out2:
kfree(im);
out1:
kfree(msg);
out0:
- complete_request_key(cons, ret);
+ key_revoke(cons->key);
+ key_revoke(cons->authkey);
return ret;
}