Commit 39280a5a authored by Peng Tao's avatar Peng Tao Committed by Tom Haynes
Browse files

nfs41: move file layout macros to generic pnfs 



They can be reused by flexfile layout as well.

Also add a code such that if read fails on one DS and
there are other DSes available to use, don't resend
through MDS but through pNFS so that client can read
from other DSes.

Reviewed-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTom Haynes <Thomas.Haynes@primarydata.com>
parent 064172f3

fs/nfs/filelayout/filelayout.h

+0 −10
Original line number Diff line number Diff line
@@ -32,13 +32,6 @@ 


#include "../pnfs.h"



/*

 * Default data server connection timeout and retrans vaules.

 * Set by module paramters dataserver_timeo and dataserver_retrans.

 */

#define NFS4_DEF_DS_TIMEO   600 /* in tenths of a second */

#define NFS4_DEF_DS_RETRANS 5



/*

 * Field testing shows we need to support up to 4096 stripe indices.

 * We store each index as a u8 (u32 on the wire) to keep the memory footprint
@@ -48,9 +41,6 @@ 
#define NFS4_PNFS_MAX_STRIPE_CNT 4096

#define NFS4_PNFS_MAX_MULTI_CNT  256 /* 256 fit into a u8 stripe_index */



/* error codes for internal use */

#define NFS4ERR_RESET_TO_MDS   12001



enum stripetype4 {

	STRIPE_SPARSE = 1,

	STRIPE_DENSE = 2

fs/nfs/pnfs.h

+11 −0
Original line number Diff line number Diff line
@@ -77,6 +77,17 @@ enum pnfs_try_status { 


#define LAYOUT_NFSV4_1_MODULE_PREFIX "nfs-layouttype4"



/*

 * Default data server connection timeout and retrans vaules.

 * Set by module parameters dataserver_timeo and dataserver_retrans.

 */

#define NFS4_DEF_DS_TIMEO   600 /* in tenths of a second */

#define NFS4_DEF_DS_RETRANS 5



/* error codes for internal use */

#define NFS4ERR_RESET_TO_MDS   12001

#define NFS4ERR_RESET_TO_PNFS  12002



enum {

	NFS_LAYOUT_RO_FAILED = 0,	/* get ro layout failed stop trying */

	NFS_LAYOUT_RW_FAILED,		/* get rw layout failed stop trying */

CRA Git | Maintained and supported by SUSTech CRA and CCSE