Commit 02591f9f authored by Dai Ngo's avatar Dai Ngo Committed by Chuck Lever
Browse files

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: default avatarDai Ngo <dai.ngo@oracle.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent ec59659b

fs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -333,6 +333,10 @@ config NFS_COMMON 
	depends on NFSD || NFS_FS || LOCKD

	default y



config NFS_V4_2_SSC_HELPER

	tristate

	default y if NFS_V4=y || NFS_FS=y



source "net/sunrpc/Kconfig"

source "fs/ceph/Kconfig"

source "fs/cifs/Kconfig"

fs/nfs/nfs4file.c

+4 −0
Original line number Diff line number Diff line
@@ -420,7 +420,9 @@ 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

}



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

+12 −0
Original line number Diff line number Diff line
@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = { 
};

EXPORT_SYMBOL_GPL(nfs_sops);



#ifdef CONFIG_NFS_V4_2

static const struct nfs_ssc_client_ops nfs_ssc_clnt_ops_tbl = {

	.sco_sb_deactive = nfs_sb_deactive,

};

#endif



#if IS_ENABLED(CONFIG_NFS_V4)

static int __init register_nfs4_fs(void)
@@ -111,15 +113,21 @@ static void unregister_nfs4_fs(void) 
}

#endif



#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 */



static struct shrinker acl_shrinker = {

	.count_objects	= nfs_access_cache_count,
@@ -148,7 +156,9 @@ int __init register_nfs_fs(void) 
	ret = register_shrinker(&acl_shrinker);

	if (ret < 0)

		goto error_3;

#ifdef CONFIG_NFS_V4_2

	nfs_ssc_register_ops();

#endif

	return 0;

error_3:

	nfs_unregister_sysctl();
@@ -168,7 +178,9 @@ void __exit unregister_nfs_fs(void) 
	unregister_shrinker(&acl_shrinker);

	nfs_unregister_sysctl();

	unregister_nfs4_fs();

#ifdef CONFIG_NFS_V4_2

	nfs_ssc_unregister_ops();

#endif

	unregister_filesystem(&nfs_fs_type);

}

fs/nfs_common/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o 
nfs_acl-objs := nfsacl.o



obj-$(CONFIG_GRACE_PERIOD) += grace.o

obj-$(CONFIG_GRACE_PERIOD) += nfs_ssc.o
 
obj-$(CONFIG_NFS_V4_2_SSC_HELPER) += nfs_ssc.o

fs/nfs_common/nfs_ssc.c

+0 −2
Original line number Diff line number Diff line 
// 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

 *

 * Author: Dai Ngo <dai.ngo@oracle.com>