Hi Linus,
Please pull from the signed tag "nfs-for-3.4-2" in the repository at
git pull git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tag nfs-for-3.4-2
This will update the following files through the appended changesets.
Cheers,
Trond
----
fs/nfs/nfs4filelayout.c | 1 -
fs/nfs/nfs4proc.c | 43 +++++++++++++++++++++++--------------------
net/sunrpc/rpcb_clnt.c | 2 +-
3 files changed, 24 insertions(+), 22 deletions(-)
commit 14977489ffdb80d4caf5a184ba41b23b02fbacd9
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Mar 27 18:31:25 2012 -0400
NFSv4: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_error
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit e59d27e05a6435f8c04d5ad843f37fa795f2eaaa
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Mar 27 18:22:19 2012 -0400
NFSv4.1: Fix layoutcommit error handling
Firstly, task->tk_status will always return negative error values,
so the current tests for 'NFS4ERR_DELEG_REVOKED' etc. are all being
ignored.
Secondly, clean up the code so that we only need to test
task->tk_status once!
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
commit 05e9cfb408b24debb3a85fd98edbfd09dd148881
Author: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Date: Tue Mar 27 18:13:02 2012 -0400
NFSv4: Fix two infinite loops in the mount code
We can currently loop forever in nfs4_lookup_root() and in
nfs41_proc_secinfo_no_name(), if the first iteration returns a
NFS4ERR_DELAY or something else that causes exception.retry to get
set.
Reported-by: Weston Andros Adamson <dros@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
commit 864cf9bf99f62d2095c8e6cc3a87af80b263984e
Author: Bryan Schumaker <bjschuma@xxxxxxxxxx>
Date: Tue Mar 27 13:46:32 2012 -0400
SUNRPC: Use the already looked-up xprt in rpcb_getport_async()
rbcb_getport_async() was looking up the rpc_xprt (reference++) and then
later looking it up again (reference++) to pass through the
rpcbind_args. The xprt would only be dereferenced once, when we were
done with the rpcbind_args (reference--). This leaves an extra
reference to the transport that would never go away.
Signed-off-by: Bryan Schumaker <bjschuma@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit d44fc387997c0750125cfb0c2c803a3171b649f4
Author: Fred Isaman <iisaman@xxxxxxxxxx>
Date: Thu Mar 22 01:39:34 2012 -0400
NFS4.1: remove duplicate variable declaration in filelayout_clear_request_commit
inode is declared twice for no good reason
Signed-off-by: Fred Isaman <iisaman@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
commit 20e0fa98b751facf9a1101edaefbc19c82616a68
Author: Sachin Prabhu <sprabhu@xxxxxxxxxx>
Date: Thu Mar 22 16:46:28 2012 +0000
Fix length of buffer copied in __nfs4_get_acl_uncached
_copy_from_pages() used to copy data from the temporary buffer to the
user passed buffer is passed the wrong size parameter when copying
data. res.acl_len contains both the bitmap and acl lenghts while
acl_len contains the acl length after adjusting for the bitmap size.
Signed-off-by: Sachin Prabhu <sprabhu@xxxxxxxxxx>
Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
Attachment:
signature.asc
Description: This is a digitally signed message part
