Commit d9092b4b authored by Dai Ngo's avatar Dai Ngo Committed by Trond Myklebust
Browse files

NFSv4.2: Remove ifdef CONFIG_NFSD from NFSv4.2 client SSC code. 



The client SSC code should not depend on any of the CONFIG_NFSD config.
This patch removes all CONFIG_NFSD from NFSv4.2 client SSC code and
simplifies the config of CONFIG_NFS_V4_2_SSC_HELPER, NFSD_V4_2_INTER_SSC.

Signed-off-by: default avatarDai Ngo <dai.ngo@oracle.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 13bcf7e3

fs/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -334,8 +334,8 @@ config NFS_COMMON 
	default y



config NFS_V4_2_SSC_HELPER

	tristate

	default y if NFS_V4=y || NFS_FS=y

	bool

	default y if NFS_V4_2



source "net/sunrpc/Kconfig"

source "fs/ceph/Kconfig"

fs/nfs/nfs4file.c

+0 −4
Original line number Diff line number Diff line
@@ -420,9 +420,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = { 
 */

void nfs42_ssc_register_ops(void)

{

#ifdef CONFIG_NFSD_V4

	nfs42_ssc_register(&nfs4_ssc_clnt_ops_tbl);

#endif

}



/**
@@ -433,9 +431,7 @@ void nfs42_ssc_register_ops(void) 
 */

void nfs42_ssc_unregister_ops(void)

{

#ifdef CONFIG_NFSD_V4

	nfs42_ssc_unregister(&nfs4_ssc_clnt_ops_tbl);

#endif

}

#endif /* CONFIG_NFS_V4_2 */

fs/nfs/super.c

+0 −4
Original line number Diff line number Diff line
@@ -116,16 +116,12 @@ static void unregister_nfs4_fs(void) 
#ifdef CONFIG_NFS_V4_2

static void nfs_ssc_register_ops(void)

{

#ifdef CONFIG_NFSD_V4

	nfs_ssc_register(&nfs_ssc_clnt_ops_tbl);

#endif

}



static void nfs_ssc_unregister_ops(void)

{

#ifdef CONFIG_NFSD_V4

	nfs_ssc_unregister(&nfs_ssc_clnt_ops_tbl);

#endif

}

#endif /* CONFIG_NFS_V4_2 */

fs/nfsd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ config NFSD_FLEXFILELAYOUT 


config NFSD_V4_2_INTER_SSC

	bool "NFSv4.2 inter server to server COPY"

	depends on NFSD_V4 && NFS_V4_1 && NFS_V4_2

	depends on NFSD_V4 && NFS_V4_2

	help

	  This option enables support for NFSv4.2 inter server to

	  server copy where the destination server calls the NFSv4.2