Hi Linus, The following changes since commit f927318840745095cc7003f1564ca4b87655745d:
Merge tag 'nfs-for-3.12-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (2013-09-30 17:10:26 -0700) are available in the git repository at: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tags/nfs-for-3.13-1 for you to fetch changes up to fab99ebe39fe7d11fbd9b5fb84f07432af9ba36f: NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security (2013-11-04 16:42:52 -0500) ---------------------------------------------------------------- NFS client updates for Linux 3.13 Highlights include: - Changes to the RPC socket code to allow NFSv4 to turn off timeout+retry - Detect TCP connection breakage through the "keepalive" mechanism - Add client side support for NFSv4.x migration (Chuck Lever) - Add support for multiple security flavour arguments to the "sec=" mount option (Dros Adamson) - fs-cache bugfixes from David Howells: - Fix an issue whereby caching can be enabled on a file that is open for writing - More NFSv4 open code stable bugfixes - Various Labeled NFS (selinux) bugfixes, including one stable fix - Fix buffer overflow checking in the RPCSEC_GSS upcall encoding ---------------------------------------------------------------- Andy Adamson (1): NFSv4 Remove zeroing state kern warnings Chuck Lever (20): SUNRPC: Modify synopsis of rpc_client_register() NFS: Add nfs4_update_server NFS: Add functions to swap transports during migration recovery NFS: Introduce a vector of migration recovery ops NFS: Export _nfs_display_fhandle() NFS: Add method to retrieve fs_locations during migration recovery NFS: Add a super_block backpointer to the nfs_server struct NFS: Add basic migration support to state manager thread NFS: Re-use exit code in nfs4_async_handle_error() NFS: Rename "stateid_invalid" label NFS: Add migration recovery callouts in nfs4proc.c NFS: Handle NFS4ERR_MOVED during delegation recall NFS: Add method to detect whether an FSID is still on the server NFS: Support NFS4ERR_LEASE_MOVED recovery in state manager NFS: Implement support for NFS4ERR_LEASE_MOVED NFS: Migration support for RELEASE_LOCKOWNER NFS: Handle NFS4ERR_LEASE_MOVED during async RENEW NFS: Handle SEQ4_STATUS_LEASE_MOVED NFS: Set EXCHGID4_FLAG_SUPP_MOVED_MIGR NFS: Fix possible endless state recovery wait David Howells (3): FS-Cache: Add use/unuse/wake cookie wrappers FS-Cache: Provide the ability to enable/disable cookies NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open() Geyslan G. Bem (3): nfs: Remove useless 'error' assignment nfs: Use PTR_ERR_OR_ZERO in 'nfs41_callback_up' function nfs: Use PTR_ERR_OR_ZERO in 'nfs/nfs4super.c' J. Bruce Fields (2): sunrpc: comment typo fix nfs: use IS_ROOT not DCACHE_DISCONNECTED Jeff Layton (5): nfs: reject version and minorversion changes on remount attempts nfs: fix handling of invalid mount options in nfs_remount nfs: fix inverted test for delegation in nfs4_reclaim_open_state nfs: fix oops when trying to set SELinux label nfs: set security label when revalidating inode NeilBrown (1): SUNRPC: close a rare race in xs_tcp_setup_socket. Trond Myklebust (24): NFSv4: Fix a use-after-free situation in _nfs4_proc_getlk() SUNRPC: Enable the keepalive option for TCP sockets SUNRPC: Only update the TCP connect cookie on a successful connect SUNRPC: Don't set the request connect_cookie until a successful transmit SUNRPC: Clear the request rq_bytes_sent field in xprt_release_write SUNRPC: Clean up - convert xprt_prepare_transmit to return a bool SUNRPC: Add RPC task and client level options to disable the resend timeout NFSv4: Ensure that we disable the resend timeout for NFSv4 SUNRPC: Fix RPC call retransmission statistics SUNRPC: Remove redundant initialisations of request rq_bytes_sent SUNRPC: call_connect_status should recheck bind and connect status on error NFSv4.1: Don't change the security label as part of open reclaim. NFSv4: Fix state reference counting in _nfs4_opendata_reclaim_to_nfs4_state SUNRPC: Add a helper to switch the transport of an rpc_clnt SUNRPC: Add correct rcu_dereference annotation in rpc_clnt_set_transport SUNRPC: gss_alloc_msg - choose _either_ a v0 message or a v1 message SUNRPC: Fix buffer overflow checking in gss_encode_v0_msg/gss_encode_v1_msg Merge branch 'fscache' of git://git.kernel.org/.../dhowells/linux-fs into linux-next SUNRPC: Cleanup xs_destroy() NFS: Fix a missing initialisation when reading the SELinux label NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec NFSv4.2: encode_readdir - only ask for labels when doing readdirplus NFSv4: Sanity check the server reply in _nfs4_server_capabilities NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security Wei Yongjun (1): SUNRPC: remove duplicated include from clnt.c Weston Andros Adamson (8): NFSv4: fix NULL dereference in open recover NFSv4: don't fail on missing fattr in open recover NFSv4: don't reprocess cached open CLAIM_PREVIOUS NFSv4: make nfs_find_best_sec static NFS: separate passed security flavs from selected NFS: cache parsed auth_info in nfs_server NFS: stop using NFS_MOUNT_SECFLAVOUR server flag NFS: add support for multiple sec= mount options wangweidong (1): SUNRPC: remove an unnecessary if statement Documentation/filesystems/caching/netfs-api.txt | 73 +++- fs/9p/cache.c | 6 +- fs/afs/cell.c | 2 +- fs/afs/inode.c | 2 +- fs/afs/vlocation.c | 3 +- fs/afs/volume.c | 2 +- fs/cachefiles/interface.c | 2 +- fs/ceph/cache.c | 4 +- fs/cifs/fscache.c | 8 +- fs/fscache/cookie.c | 193 +++++++--- fs/fscache/fsdef.c | 1 + fs/fscache/netfs.c | 1 + fs/fscache/object.c | 7 +- fs/fscache/page.c | 59 ++- fs/nfs/Kconfig | 11 + fs/nfs/callback.c | 3 +- fs/nfs/client.c | 10 +- fs/nfs/dir.c | 10 +- fs/nfs/fscache.c | 202 +++------- fs/nfs/fscache.h | 18 +- fs/nfs/inode.c | 16 +- fs/nfs/internal.h | 8 +- fs/nfs/nfs4_fs.h | 17 +- fs/nfs/nfs4client.c | 138 ++++++- fs/nfs/nfs4file.c | 2 +- fs/nfs/nfs4namespace.c | 118 +++++- fs/nfs/nfs4proc.c | 470 +++++++++++++++++++++--- fs/nfs/nfs4state.c | 264 ++++++++++++- fs/nfs/nfs4super.c | 12 +- fs/nfs/nfs4xdr.c | 138 +++++-- fs/nfs/super.c | 198 ++++++---- fs/nfs/unlink.c | 3 +- include/linux/fs.h | 5 + include/linux/fscache-cache.h | 50 +-- include/linux/fscache.h | 113 +++++- include/linux/nfs4.h | 5 +- include/linux/nfs_fs.h | 8 +- include/linux/nfs_fs_sb.h | 10 + include/linux/nfs_xdr.h | 24 ++ include/linux/sunrpc/clnt.h | 6 + include/linux/sunrpc/sched.h | 1 + include/linux/sunrpc/xprt.h | 2 +- include/uapi/linux/nfs_mount.h | 2 +- net/sunrpc/auth_gss/auth_gss.c | 57 ++- net/sunrpc/clnt.c | 148 ++++++-- net/sunrpc/xprt.c | 63 ++-- net/sunrpc/xprtsock.c | 47 ++- 47 files changed, 1944 insertions(+), 598 deletions(-) -- Trond Myklebust Linux NFS client maintainer NetApp trond.mykleb...@netapp.com www.netapp.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/