Linus Torvalds 61845143fe Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux ... Pull nfsd updates from Bruce Fields: "The main change is the pNFS block server support from Christoph, which allows an NFS client connected to shared disk to do block IO to the shared disk in place of NFS reads and writes. This also requires xfs patches, which should arrive soon through the xfs tree, barring unexpected problems. Support for other filesystems is also possible if there's interest. Thanks also to Chuck Lever for continuing work to get NFS/RDMA into shape" * 'for-3.20' of git://linux-nfs.org/~bfields/linux: (32 commits) nfsd: default NFSv4.2 to on nfsd: pNFS block layout driver exportfs: add methods for block layout exports nfsd: add trace events nfsd: update documentation for pNFS support nfsd: implement pNFS layout recalls nfsd: implement pNFS operations nfsd: make find_any_file available outside nfs4state.c nfsd: make find/get/put file available outside nfs4state.c nfsd: make lookup/alloc/unhash_stid available outside nfs4state.c nfsd: add fh_fsid_match helper nfsd: move nfsd_fh_match to nfsfh.h fs: add FL_LAYOUT lease type fs: track fl_owner for leases nfs: add LAYOUT_TYPE_MAX enum value nfsd: factor out a helper to decode nfstime4 values sunrpc/lockd: fix references to the BKL nfsd: fix year-2038 nfs4 state problem svcrdma: Handle additional inline content svcrdma: Move read list XDR round-up logic ...		2015-02-12 10:39:41 -08:00
..
clnt4xdr.c	nfsd: remove <linux/nfsd/nfsfh.h>	2014-05-06 17:54:53 -04:00
clntlock.c
clntproc.c
clntxdr.c	nfsd: remove <linux/nfsd/nfsfh.h>	2014-05-06 17:54:53 -04:00
host.c
Makefile	lockd: add a /proc/fs/lockd/nlm_end_grace file	2014-09-17 16:33:13 -04:00
mon.c	SUNRPC: NULL utsname dereference on NFS umount during namespace cleanup	2015-02-03 16:40:17 -05:00
netns.h	lockd: move lockd's grace period handling into its own module	2014-09-17 16:33:11 -04:00
procfs.c	lockd: add a /proc/fs/lockd/nlm_end_grace file	2014-09-17 16:33:13 -04:00
procfs.h	lockd: add a /proc/fs/lockd/nlm_end_grace file	2014-09-17 16:33:13 -04:00
svc4proc.c
svc.c	LOCKD: Fix a race when initialising nlmsvc_timeout	2015-01-05 19:40:53 -08:00
svclock.c	sunrpc/lockd: fix references to the BKL	2015-01-23 10:29:12 -05:00
svcproc.c
svcshare.c
svcsubs.c	locks: add a dedicated spinlock to protect i_flctx lists	2015-01-16 16:08:49 -05:00
xdr4.c
xdr.c	lockd: xdr: Remove unused function	2015-01-15 13:46:27 -05:00