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 ...
Showing the changes to include/uapi/linux (2 of 40 files). Show all
Unified · Split
| @@ -32,6 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #define NFSDDBG_REPCACHE 0x0080 |
| 33 | 33 | #define NFSDDBG_XDR 0x0100 |
| 34 | 34 | #define NFSDDBG_LOCKD 0x0200 |
| 35 | +#define NFSDDBG_PNFS 0x0400 | |
| 35 | 36 | #define NFSDDBG_ALL 0x7FFF |
| 36 | 37 | #define NFSDDBG_NOCHANGE 0xFFFF |
| 37 | 38 | |
| @@ -47,8 +47,10 @@ · 46 unmodified lines | ||
| 47 | 47 | * exported filesystem. |
| 48 | 48 | */ |
| 49 | 49 | #define NFSEXP_V4ROOT 0x10000 |
| 50 | +#define NFSEXP_NOPNFS 0x20000 | |
| 51 | + | |
| 50 | 52 | /* All flags that we claim to support. (Note we don't support NOACL.) */ |
| 51 | −#define NFSEXP_ALLFLAGS 0x1FE7F | |
| 53 | +#define NFSEXP_ALLFLAGS 0x3FE7F | |
| 52 | 54 | |
| 53 | 55 | /* The flags that may vary depending on security flavor: */ |
| 54 | 56 | #define NFSEXP_SECINFO_FLAGS (NFSEXP_READONLY | NFSEXP_ROOTSQUASH \ |