xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit d9092b4bb2109502eb8972021a3f74febc931a63 ]

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: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dai Ngo
2021-04-22 03:37:49 -04:00
committed by Greg Kroah-Hartman
parent 3793f28102
commit b2c0c7cb7f
4 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/Kconfig
View File

@@ -334,8 +334,8 @@ config NFS_COMMON
default y default y
config NFS_V4_2_SSC_HELPER config NFS_V4_2_SSC_HELPER
tristate bool
default y if NFS_V4=y || NFS_FS=y default y if NFS_V4_2
source "net/sunrpc/Kconfig" source "net/sunrpc/Kconfig"
source "fs/ceph/Kconfig" source "fs/ceph/Kconfig"

4
fs/nfs/nfs4file.c
View File

@@ -430,9 +430,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
*/ */
void nfs42_ssc_register_ops(void) void nfs42_ssc_register_ops(void)
{ {
#ifdef CONFIG_NFSD_V4
nfs42_ssc_register(&nfs4_ssc_clnt_ops_tbl); nfs42_ssc_register(&nfs4_ssc_clnt_ops_tbl);
#endif
} }
/** /**
@@ -443,9 +441,7 @@ void nfs42_ssc_register_ops(void)
*/ */
void nfs42_ssc_unregister_ops(void) void nfs42_ssc_unregister_ops(void)
{ {
#ifdef CONFIG_NFSD_V4
nfs42_ssc_unregister(&nfs4_ssc_clnt_ops_tbl); nfs42_ssc_unregister(&nfs4_ssc_clnt_ops_tbl);
#endif
} }
#endif /* CONFIG_NFS_V4_2 */ #endif /* CONFIG_NFS_V4_2 */

4
fs/nfs/super.c
View File

@@ -116,16 +116,12 @@ static void unregister_nfs4_fs(void)
#ifdef CONFIG_NFS_V4_2 #ifdef CONFIG_NFS_V4_2
static void nfs_ssc_register_ops(void) static void nfs_ssc_register_ops(void)
{ {
#ifdef CONFIG_NFSD_V4
nfs_ssc_register(&nfs_ssc_clnt_ops_tbl); nfs_ssc_register(&nfs_ssc_clnt_ops_tbl);
#endif
} }
static void nfs_ssc_unregister_ops(void) static void nfs_ssc_unregister_ops(void)
{ {
#ifdef CONFIG_NFSD_V4
nfs_ssc_unregister(&nfs_ssc_clnt_ops_tbl); nfs_ssc_unregister(&nfs_ssc_clnt_ops_tbl);
#endif
} }
#endif /* CONFIG_NFS_V4_2 */ #endif /* CONFIG_NFS_V4_2 */

2
fs/nfsd/Kconfig
View File

@@ -138,7 +138,7 @@ config NFSD_FLEXFILELAYOUT
config NFSD_V4_2_INTER_SSC config NFSD_V4_2_INTER_SSC
bool "NFSv4.2 inter server to server COPY" 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 help
This option enables support for NFSv4.2 inter server to This option enables support for NFSv4.2 inter server to
server copy where the destination server calls the NFSv4.2 server copy where the destination server calls the NFSv4.2