diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2012-08-09 14:05:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 09:59:25 -0700 |
commit | bdd78615ccef0cb43ab4214c9f315efdefedcd6e (patch) | |
tree | 7abcb689b1e1d04fa51c577375ff258c9df04314 /fs | |
parent | 28a59a3a607da7fccc376d378ed7d9937af6ae08 (diff) |
NFS: return -ENOKEY when the upcall fails to map the name
commit 12dfd080556124088ed61a292184947711b46cbe upstream.
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>
Tested-by: William Dauchy <wdauchy@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/idmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index bf184841f595..a0972e9898f8 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -763,9 +763,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); @@ -782,7 +781,6 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) out: complete_request_key(cons, ret); -out_incomplete: return ret; } |