From aca741877d00d9b55cbd23d673afa2dedebb1ae9 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Mon, 12 Mar 2012 11:33:00 -0400 Subject: [PATCH] --- yaml --- r: 294555 b: refs/heads/master c: 11588f493a2441f09ceb2088d07cc012b53cbf75 h: refs/heads/master i: 294553: 08a59005a0cfd385325ee4e511d3fdeded613b7d 294551: f5cc9e2fb10c91de3e3a4caa38c21338b9978075 v: v3 --- [refs] | 2 +- trunk/fs/nfs/idmap.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd27038f0130..8ef01e270219 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b7c8dd205d6df1629ccde9f6dcf6a85d34c37ff +refs/heads/master: 11588f493a2441f09ceb2088d07cc012b53cbf75 diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c index f9f89fc83ee0..a701a83047d3 100644 --- a/trunk/fs/nfs/idmap.c +++ b/trunk/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; }