From 843cff5abd3d6668f5d4862e05eabc8c07bbe3f9 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 19 Nov 2013 22:38:47 +0800 Subject: [PATCH] staging/lustre: remove INIT_STRATEGY legacy code used to support kernel where struct ctl_table has strategy member. Cc: Andreas Dilger Signed-off-by: Peng Tao Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/include/linux/libcfs/linux/kp30.h | 4 ---- drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h index ba7854159d7d..3a883f82e64f 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h @@ -204,8 +204,4 @@ extern int lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size, */ # define LPPID "%d" -/* compat macroses */ - -#define INIT_STRATEGY(a) - #endif diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c index f2bb8672a4ff..ef0ab106496f 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c @@ -452,7 +452,6 @@ static ctl_table_t lnet_table[] = { .maxlen = sizeof(int), .mode = 0444, .proc_handler = &proc_dointvec, - INIT_STRATEGY(&sysctl_intvec) }, { .procname = "catastrophe", @@ -460,7 +459,6 @@ static ctl_table_t lnet_table[] = { .maxlen = sizeof(int), .mode = 0444, .proc_handler = &proc_dointvec, - INIT_STRATEGY(&sysctl_intvec) }, { .procname = "panic_on_lbug", @@ -468,7 +466,6 @@ static ctl_table_t lnet_table[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = &proc_dointvec, - INIT_STRATEGY(&sysctl_intvec) }, { .procname = "dump_kernel", -- 2.30.2