mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
4d3f1a6e78
* kernel: bump 5.10 to 5.10.143 All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> * kernel: refresh 5.10 patches All patches automatically rebased. Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Co-authored-by: John Audia <therealgraysky@proton.me>
85 lines
2.1 KiB
Diff
85 lines
2.1 KiB
Diff
From d9092b4bb2109502eb8972021a3f74febc931a63 Mon Sep 17 00:00:00 2001
|
|
From: Dai Ngo <dai.ngo@oracle.com>
|
|
Date: Thu, 22 Apr 2021 03:37:49 -0400
|
|
Subject: [PATCH] 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: Dai Ngo <dai.ngo@oracle.com>
|
|
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
|
|
---
|
|
fs/Kconfig | 4 ++--
|
|
fs/nfs/nfs4file.c | 4 ----
|
|
fs/nfs/super.c | 4 ----
|
|
fs/nfsd/Kconfig | 2 +-
|
|
4 files changed, 3 insertions(+), 11 deletions(-)
|
|
|
|
--- a/fs/Kconfig
|
|
+++ b/fs/Kconfig
|
|
@@ -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"
|
|
--- a/fs/nfs/nfs4file.c
|
|
+++ b/fs/nfs/nfs4file.c
|
|
@@ -430,9 +430,7 @@ static const struct nfs4_ssc_client_ops
|
|
*/
|
|
void nfs42_ssc_register_ops(void)
|
|
{
|
|
-#ifdef CONFIG_NFSD_V4
|
|
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)
|
|
{
|
|
-#ifdef CONFIG_NFSD_V4
|
|
nfs42_ssc_unregister(&nfs4_ssc_clnt_ops_tbl);
|
|
-#endif
|
|
}
|
|
#endif /* CONFIG_NFS_V4_2 */
|
|
|
|
--- a/fs/nfs/super.c
|
|
+++ b/fs/nfs/super.c
|
|
@@ -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 */
|
|
|
|
--- a/fs/nfsd/Kconfig
|
|
+++ b/fs/nfsd/Kconfig
|
|
@@ -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
|