From 306a24df1ca423a17fe92ef2e93008b759075ed7 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Mon, 29 Jun 2015 14:35:38 -0500 Subject: [PATCH] LU-6261 gnilnd: Clean up cfs abstractions from gnilnd Running the script contrib/scripts/libcfs_cleanup.sed gets us ready for cfs changes. find lnet/klnds/gnilnd -name "*.[ch]" -exec \ sed -i -f contrib/scripts/libcfs_cleanup.sed {} ; Signed-off-by: Chris Horn Change-Id: Ie7aa1616d33d9f60870f4b8c2a946ce66d3c348c Reviewed-on: http://review.whamcloud.com/15437 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: James Shimek Reviewed-by: Doug Oucharek Reviewed-by: Oleg Drokin --- lnet/klnds/gnilnd/gnilnd.h | 2 +- lnet/klnds/gnilnd/gnilnd_modparams.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lnet/klnds/gnilnd/gnilnd.h b/lnet/klnds/gnilnd/gnilnd.h index e2d1a72..0b599ae 100644 --- a/lnet/klnds/gnilnd/gnilnd.h +++ b/lnet/klnds/gnilnd/gnilnd.h @@ -486,7 +486,7 @@ typedef struct kgn_tunables { int *kgn_thread_affinity; /* bind scheduler threads to cpus */ int *kgn_thread_safe; /* use thread safe kgni API */ #if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM - cfs_sysctl_table_header_t *kgn_sysctl; /* sysctl interface */ + struct ctl_table_header *kgn_sysctl; /* sysctl interface */ #endif } kgn_tunables_t; diff --git a/lnet/klnds/gnilnd/gnilnd_modparams.c b/lnet/klnds/gnilnd/gnilnd_modparams.c index 26814aa..3436a96 100644 --- a/lnet/klnds/gnilnd/gnilnd_modparams.c +++ b/lnet/klnds/gnilnd/gnilnd_modparams.c @@ -577,7 +577,7 @@ kgnilnd_tunables_init() #if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM kgnilnd_tunables.kgn_sysctl = - cfs_register_sysctl_table(kgnilnd_top_ctl_table, 0); + register_sysctl_table(kgnilnd_top_ctl_table, 0); if (kgnilnd_tunables.kgn_sysctl == NULL) CWARN("Can't setup /proc tunables\n"); @@ -629,6 +629,6 @@ kgnilnd_tunables_fini() { #if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM if (kgnilnd_tunables.kgn_sysctl != NULL) - cfs_unregister_sysctl_table(kgnilnd_tunables.kgn_sysctl); + unregister_sysctl_table(kgnilnd_tunables.kgn_sysctl); #endif } -- 1.8.3.1