This is a note to let you know that I've just added the patch titled
NFS: return -ENOKEY when the upcall fails to map the name
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfs-return-enokey-when-the-upcall-fails-to-map-the-name.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 12dfd080556124088ed61a292184947711b46cbe Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <[email protected]>
Date: Thu, 9 Aug 2012 14:05:50 -0400
Subject: NFS: return -ENOKEY when the upcall fails to map the name
From: Bryan Schumaker <[email protected]>
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 <[email protected]>
Tested-by: William Dauchy <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
fs/nfs/idmap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -747,9 +747,8 @@ idmap_pipe_downcall(struct file *filp, c
}
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);
@@ -766,7 +765,6 @@ idmap_pipe_downcall(struct file *filp, c
out:
complete_request_key(cons, ret);
-out_incomplete:
return ret;
}
Patches currently in stable-queue which might be from [email protected] are
queue-3.4/nfs-clear-key-construction-data-if-the-idmap-upcall-fails.patch
queue-3.4/nfs-return-enokey-when-the-upcall-fails-to-map-the-name.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
