From: bjschuma@netapp.com
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 2/3] NFS: return -ENOKEY when the upcall fails to map the name
Date: Thu, 9 Aug 2012 14:05:50 -0400 [thread overview]
Message-ID: <1344535551-4412-2-git-send-email-bjschuma@netapp.com> (raw)
In-Reply-To: <1344535551-4412-1-git-send-email-bjschuma@netapp.com>
From: Bryan Schumaker <bjschuma@netapp.com>
This allows the normal error-paths to handle the error, rather than
making a special call to complete_request_key() just for this instance.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
---
fs/nfs/idmap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index c2b4004..9864b48 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -756,9 +756,8 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
}
if (!(im.im_status & IDMAP_STATUS_SUCCESS)) {
- ret = mlen;
- complete_request_key(cons, -ENOKEY);
- goto out_incomplete;
+ ret = -ENOKEY;
+ goto out;
}
namelen_in = strnlen(im.im_name, IDMAP_NAMESZ);
@@ -775,7 +774,6 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
out:
complete_request_key(cons, ret);
-out_incomplete:
return ret;
}
--
1.7.11.4
next prev parent reply other threads:[~2012-08-09 18:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 18:05 [PATCH 1/3] NFS: Clear key construction data if the idmap upcall fails bjschuma
2012-08-09 18:05 ` bjschuma [this message]
2012-08-10 10:10 ` [PATCH 2/3] NFS: return -ENOKEY when the upcall fails to map the name William Dauchy
2012-08-10 11:04 ` William Dauchy
2012-08-09 18:05 ` [PATCH 3/3] NFS: Use kzalloc() instead of kmalloc() in the idmapper bjschuma
2012-08-10 10:10 ` William Dauchy
2012-08-10 16:16 ` Myklebust, Trond
2012-08-12 17:48 ` William Dauchy
2012-08-10 10:09 ` [PATCH 1/3] NFS: Clear key construction data if the idmap upcall fails William Dauchy
2012-08-16 13:45 ` William Dauchy
2012-08-16 15:07 ` William Dauchy
2012-08-16 15:21 ` Bryan Schumaker
2012-08-16 15:34 ` William Dauchy
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=1344535551-4412-2-git-send-email-bjschuma@netapp.com \
--to=bjschuma@netapp.com \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/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.