Commit 691bc0eb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove ctl_table typedefs 



No need for these, just use the "real" struct the kernel provides.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9fc48d00

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 
/*

 * Sysctl register

 */

typedef struct ctl_table		ctl_table_t;

typedef struct ctl_table_header		ctl_table_header_t;



#define DECLARE_PROC_HANDLER(name)		      \

static int					      \

LL_PROC_PROTO(name)				     \

drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
#define ll_proc_dostring(table, write, filp, buffer, lenp, ppos)	\

	proc_dostring(table, write, buffer, lenp, ppos);

#define LL_PROC_PROTO(name)					     \

	name(ctl_table_t *table, int write,		      \

	name(struct ctl_table *table, int write,		      \

	     void __user *buffer, size_t *lenp, loff_t *ppos)



/* helper for sysctl handlers */

drivers/staging/lustre/lnet/lnet/router_proc.c

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
/* This is really lnet_proc.c. You might need to update sanity test 215

 * if any file format is changed. */



static ctl_table_header_t *lnet_table_header;

static struct ctl_table_header *lnet_table_header;



#define CTL_LNET	 (0x100)

enum {
@@ -845,7 +845,7 @@ out: 
}

DECLARE_PROC_HANDLER(proc_lnet_portal_rotor);



static ctl_table_t lnet_table[] = {

static struct ctl_table lnet_table[] = {

	/*

	 * NB No .strategy entries have been provided since sysctl(8) prefers

	 * to go via /proc for portability.
@@ -889,7 +889,7 @@ static ctl_table_t lnet_table[] = { 
	}

};



static ctl_table_t top_table[] = {

static struct ctl_table top_table[] = {

	{

		.procname = "lnet",

		.mode     = 0555,

drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c

+6 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
#include <asm/div64.h>

#include "../tracefile.h"



static ctl_table_header_t *lnet_table_header = NULL;

static struct ctl_table_header *lnet_table_header = NULL;

extern char lnet_upcall[1024];

/**

 * The path of debug log dump upcall script.
@@ -217,7 +217,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb) 
int LL_PROC_PROTO(proc_console_max_delay_cs)

{

	int rc, max_delay_cs;

	ctl_table_t dummy = *table;

	struct ctl_table dummy = *table;

	cfs_duration_t d;



	dummy.data = &max_delay_cs;
@@ -248,7 +248,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs) 
int LL_PROC_PROTO(proc_console_min_delay_cs)

{

	int rc, min_delay_cs;

	ctl_table_t dummy = *table;

	struct ctl_table dummy = *table;

	cfs_duration_t d;



	dummy.data = &min_delay_cs;
@@ -279,7 +279,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs) 
int LL_PROC_PROTO(proc_console_backoff)

{

	int rc, backoff;

	ctl_table_t dummy = *table;

	struct ctl_table dummy = *table;



	dummy.data = &backoff;

	dummy.proc_handler = &proc_dointvec;
@@ -363,7 +363,7 @@ static int __proc_cpt_table(void *data, int write, 
}

DECLARE_PROC_HANDLER(proc_cpt_table)



static ctl_table_t lnet_table[] = {

static struct ctl_table lnet_table[] = {

	/*

	 * NB No .strategy entries have been provided since sysctl(8) prefers

	 * to go via /proc for portability.
@@ -516,7 +516,7 @@ static ctl_table_t lnet_table[] = { 
	}

};



static ctl_table_t top_table[] = {

static struct ctl_table top_table[] = {

	{

		.procname = "lnet",

		.mode     = 0555,

drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include "../../include/lprocfs_status.h"



#ifdef CONFIG_SYSCTL

ctl_table_header_t *obd_table_header = NULL;

struct ctl_table_header *obd_table_header = NULL;

#endif
@@ -274,7 +274,7 @@ int LL_PROC_PROTO(proc_at_history) 
}



#ifdef CONFIG_SYSCTL

static ctl_table_t obd_table[] = {

static struct ctl_table obd_table[] = {

	{

		.procname = "timeout",

		.data     = &obd_timeout,
@@ -390,7 +390,7 @@ static ctl_table_t obd_table[] = { 
	{}

};



static ctl_table_t parent_table[] = {

static struct ctl_table parent_table[] = {

	{

		.procname = "lustre",

		.data     = NULL,

CRA Git | Maintained and supported by SUSTech CRA and CCSE