OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NFSv4_2: SSC helper should use its own config. 

Currently NFSv4_2 SSC helper, nfs_ssc, incorrectly uses GRACE_PERIOD
as its config. Fix by adding new config NFS_V4_2_SSC_HELPER which
depends on NFS_V4_2 and is automatically selected when NFSD_V4 is
enabled. Also removed the file name from a comment in nfs_ssc.c.

Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Dai Ngo 2021-01-28 01:42:26 -05:00 committed by Chuck Lever
parent ec59659b49
commit 02591f9feb
6 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/Kconfig
View File

@ -333,6 +333,10 @@ config NFS_COMMON
depends on NFSD || NFS_FS || LOCKD depends on NFSD || NFS_FS || LOCKD
default y default y
config NFS_V4_2_SSC_HELPER
tristate
default y if NFS_V4=y || NFS_FS=y
source "net/sunrpc/Kconfig" source "net/sunrpc/Kconfig"
source "fs/ceph/Kconfig" source "fs/ceph/Kconfig"
source "fs/cifs/Kconfig" source "fs/cifs/Kconfig"

4
fs/nfs/nfs4file.c
View File

@ -420,7 +420,9 @@ 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
} }
/** /**
@ -431,7 +433,9 @@ 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 */

12
fs/nfs/super.c
View File

@ -86,9 +86,11 @@ const struct super_operations nfs_sops = {
}; };
EXPORT_SYMBOL_GPL(nfs_sops); EXPORT_SYMBOL_GPL(nfs_sops);
#ifdef CONFIG_NFS_V4_2
static const struct nfs_ssc_client_ops nfs_ssc_clnt_ops_tbl = { static const struct nfs_ssc_client_ops nfs_ssc_clnt_ops_tbl = {
.sco_sb_deactive = nfs_sb_deactive, .sco_sb_deactive = nfs_sb_deactive,
}; };
#endif
#if IS_ENABLED(CONFIG_NFS_V4) #if IS_ENABLED(CONFIG_NFS_V4)
static int __init register_nfs4_fs(void) static int __init register_nfs4_fs(void)
@ -111,15 +113,21 @@ static void unregister_nfs4_fs(void)
} }
#endif #endif
#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 */
static struct shrinker acl_shrinker = { static struct shrinker acl_shrinker = {
.count_objects = nfs_access_cache_count, .count_objects = nfs_access_cache_count,
@ -148,7 +156,9 @@ int __init register_nfs_fs(void)
ret = register_shrinker(&acl_shrinker); ret = register_shrinker(&acl_shrinker);
if (ret < 0) if (ret < 0)
goto error_3; goto error_3;
#ifdef CONFIG_NFS_V4_2
nfs_ssc_register_ops(); nfs_ssc_register_ops();
#endif
return 0; return 0;
error_3: error_3:
nfs_unregister_sysctl(); nfs_unregister_sysctl();
@ -168,7 +178,9 @@ void __exit unregister_nfs_fs(void)
unregister_shrinker(&acl_shrinker); unregister_shrinker(&acl_shrinker);
nfs_unregister_sysctl(); nfs_unregister_sysctl();
unregister_nfs4_fs(); unregister_nfs4_fs();
#ifdef CONFIG_NFS_V4_2
nfs_ssc_unregister_ops(); nfs_ssc_unregister_ops();
#endif
unregister_filesystem(&nfs_fs_type); unregister_filesystem(&nfs_fs_type);
} }

2
fs/nfs_common/Makefile
View File

@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o
nfs_acl-objs := nfsacl.o nfs_acl-objs := nfsacl.o
obj-$(CONFIG_GRACE_PERIOD) += grace.o obj-$(CONFIG_GRACE_PERIOD) += grace.o
obj-$(CONFIG_GRACE_PERIOD) += nfs_ssc.o obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o

2
fs/nfs_common/nfs_ssc.c
View File

@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* fs/nfs_common/nfs_ssc_comm.c
*
* Helper for knfsd's SSC to access ops in NFS client modules * Helper for knfsd's SSC to access ops in NFS client modules
* *
* Author: Dai Ngo <dai.ngo@oracle.com> * Author: Dai Ngo <dai.ngo@oracle.com>

1
fs/nfsd/Kconfig
View File

@ -76,6 +76,7 @@ config NFSD_V4
select CRYPTO_MD5 select CRYPTO_MD5
select CRYPTO_SHA256 select CRYPTO_SHA256
select GRACE_PERIOD select GRACE_PERIOD
select NFS_V4_2_SSC_HELPER if NFS_V4_2
help help
This option enables support in your system's NFS server for This option enables support in your system's NFS server for
version 4 of the NFS protocol (RFC 3530). version 4 of the NFS protocol (RFC 3530).