From: Bryan Schumaker <bjschuma@xxxxxxxxxx> idmap_pipe_downcall already clears this field if the upcall succeeds, but if it fails (rpc.idmapd isn't running) the field will still be set on the next call triggering a BUG_ON(). Signed-off-by: Bryan Schumaker <bjschuma@xxxxxxxxxx> --- fs/nfs/idmap.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index b701358..645cfe7 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -683,10 +683,12 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons, ret = rpc_queue_upcall(idmap->idmap_pipe, msg); if (ret < 0) - goto out2; + goto out3; return ret; +out3: + idmap->idmap_key_cons = NULL; out2: kfree(im); out1: -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
