pnfs/flexfiles: Add the FlexFile Layout Driver

The flexfile layout is a new layout that extends the
file layout. It is currently being drafted as a specification at
https://datatracker.ietf.org/doc/draft-ietf-nfsv4-layout-types/

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Signed-off-by: Tao Peng <bergwolf@primarydata.com>

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 3dece03..c7abc10 100644 (file)
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -128,6 +128,11 @@ config PNFS_OBJLAYOUT
        depends on NFS_V4_1 && SCSI_OSD_ULD
        default NFS_V4
 
+config PNFS_FLEXFILE_LAYOUT
+       tristate
+       depends on NFS_V4_1 && NFS_V3
+       default m
+
 config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
        string "NFSv4.1 Implementation ID Domain"
        depends on NFS_V4_1

diff --cc fs/nfs/Makefile
Simple merge

diff --cc fs/nfs/flexfilelayout/Makefile
Simple merge

diff --cc fs/nfs/flexfilelayout/flexfilelayout.c
Simple merge

diff --cc fs/nfs/flexfilelayout/flexfilelayout.h
Simple merge

diff --cc fs/nfs/flexfilelayout/flexfilelayoutdev.c
Simple merge

diff --cc fs/nfs/idmap.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/nfs/pnfs.c
Simple merge

diff --cc fs/nfs/pnfs.h
Simple merge

diff --cc include/linux/nfs4.h
Simple merge

diff --cc include/linux/nfs_idmap.h
Simple merge

diff --cc include/linux/sunrpc/metrics.h
Simple merge