From: bjschuma@netapp.com
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, joro@8bytes.org, mdauchy@gmail.com
Subject: [PATCH] NFS: Clear key construction data if the idmap upcall fails
Date: Tue, 7 Aug 2012 11:30:31 -0400 [thread overview]
Message-ID: <1344353431-28831-1-git-send-email-bjschuma@netapp.com> (raw)
From: Bryan Schumaker <bjschuma@netapp.com>
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@netapp.com>
---
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
next reply other threads:[~2012-08-07 15:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 15:30 bjschuma [this message]
2012-08-07 15:44 ` [PATCH] NFS: Clear key construction data if the idmap upcall fails Myklebust, Trond
2012-08-07 15:52 ` Bryan Schumaker
2012-08-07 16:00 ` Myklebust, Trond
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344353431-28831-1-git-send-email-bjschuma@netapp.com \
--to=bjschuma@netapp.com \
--cc=Trond.Myklebust@netapp.com \
--cc=joro@8bytes.org \
--cc=linux-nfs@vger.kernel.org \
--cc=mdauchy@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.