+++ /dev/null
-/*****************************************************************************\
- * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
- * Copyright (C) 2007 The Regents of the University of California.
- * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Brian Behlendorf <behlendorf1@llnl.gov>.
- * UCRL-CODE-235197
- *
- * This file is part of the SPL, Solaris Porting Layer.
- * For details, see <http://zfsonlinux.org/>.
- *
- * The SPL is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * The SPL is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with the SPL. If not, see <http://www.gnu.org/licenses/>.
-\*****************************************************************************/
-
-#ifndef _SPL_SYSCTL_COMPAT_H
-#define _SPL_SYSCTL_COMPAT_H
-
-#include <linux/sysctl.h>
-
-/* proc_handler() / proc_do* API changes
- * 2.6.x - 2.6.31: 6 args, prototype includes 'struct file *'
- * 2.6.32 - 2.6.y: 5 args, removed unused 'struct file *' from prototype
- *
- * Generic SPL_PROC_HANDLER() macro should be used for correct prototypes.
- * It will define the following function arguments which can and should be
- * used with the spl_proc_* helper macros.
- *
- * struct ctl_table *table,
- * int write,
- * struct file *filp [2.6.31 and earlier kernels],
- * void __user *buffer,
- * size_t *lenp,
- * loff_t *ppos,
- */
-#ifdef HAVE_5ARGS_PROC_HANDLER
-
-#define SPL_PROC_HANDLER(proc_handler) \
-static int \
-proc_handler(struct ctl_table *table, int write, \
- void __user *buffer, size_t *lenp, loff_t *ppos)
-
-#define spl_proc_dostring(table, write, filp, buffer, lenp, ppos) \
- proc_dostring(table, write, buffer, lenp, ppos)
-#define spl_proc_dointvec(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec(table, write, buffer, lenp, ppos)
-#define spl_proc_dointvec_minmax(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec_minmax(table, write, buffer, lenp, ppos)
-#define spl_proc_dointvec_jiffies(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec_jiffies(table, write, buffer, lenp, ppos)
-#define spl_proc_dointvec_userhz_jiffies(table,write,filp,buffer,lenp,ppos) \
- proc_dointvec_userhz_jiffies(table, write, buffer, lenp, ppos)
-#define spl_proc_dointvec_ms_jiffies(table,write,filp,buffer,lenp,ppos) \
- proc_dointvec_ms_jiffies(table, write, buffer, lenp, ppos)
-#define spl_proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos) \
- proc_doulongvec_minmax(table, write, buffer, lenp, ppos)
-#define spl_proc_doulongvec_ms_jiffies_minmax(table,write,filp,buffer,lenp,ppos)\
- proc_doulongvec_ms_jiffies_minmax(table, write, buffer, lenp, ppos)
-
-#else /* HAVE_5ARGS_PROC_HANDLER */
-
-#define SPL_PROC_HANDLER(proc_handler) \
-static int \
-proc_handler(struct ctl_table *table, int write, struct file *filp, \
- void __user *buffer, size_t *lenp, loff_t *ppos)
-
-#define spl_proc_dostring(table, write, filp, buffer, lenp, ppos) \
- proc_dostring(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_dointvec(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_dointvec_minmax(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec_minmax(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_dointvec_jiffies(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec_jiffies(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_dointvec_userhz_jiffies(table,write,filp,buffer,lenp,ppos) \
- proc_dointvec_userhz_jiffies(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_dointvec_ms_jiffies(table, write, filp, buffer, lenp, ppos) \
- proc_dointvec_ms_jiffies(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos) \
- proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos)
-#define spl_proc_doulongvec_ms_jiffies_minmax(table,write,filp,buffer,lenp,ppos) \
- proc_doulongvec_ms_jiffies_minmax(table,write,filp,buffer,lenp,ppos)
-
-
-#endif /* HAVE_5ARGS_PROC_HANDLER */
-
-#endif /* _SPL_SYSCTL_COMPAT_H */
}
#ifdef DEBUG_LOG
-SPL_PROC_HANDLER(proc_dobitmasks)
+static int
+proc_dobitmasks(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
unsigned long *mask = table->data;
int is_subsys = (mask == &spl_debug_subsys) ? 1 : 0;
SRETURN(rc);
}
-SPL_PROC_HANDLER(proc_debug_mb)
+static int
+proc_debug_mb(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
char str[32];
int rc, len;
SRETURN(rc);
}
-SPL_PROC_HANDLER(proc_dump_kernel)
+static int
+proc_dump_kernel(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
SENTRY;
SRETURN(0);
}
-SPL_PROC_HANDLER(proc_force_bug)
+static int
+proc_force_bug(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
SENTRY;
SRETURN(0);
}
-SPL_PROC_HANDLER(proc_console_max_delay_cs)
+static int
+proc_console_max_delay_cs(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc, max_delay_cs;
spl_ctl_table dummy = *table;
if (write) {
max_delay_cs = 0;
- rc = spl_proc_dointvec(&dummy,write,filp,buffer,lenp,ppos);
+ rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
if (rc < 0)
SRETURN(rc);
spl_console_max_delay = d;
} else {
max_delay_cs = (spl_console_max_delay * 100) / HZ;
- rc = spl_proc_dointvec(&dummy,write,filp,buffer,lenp,ppos);
+ rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
}
SRETURN(rc);
}
-SPL_PROC_HANDLER(proc_console_min_delay_cs)
+static int
+proc_console_min_delay_cs(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc, min_delay_cs;
spl_ctl_table dummy = *table;
if (write) {
min_delay_cs = 0;
- rc = spl_proc_dointvec(&dummy,write,filp,buffer,lenp,ppos);
+ rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
if (rc < 0)
SRETURN(rc);
spl_console_min_delay = d;
} else {
min_delay_cs = (spl_console_min_delay * 100) / HZ;
- rc = spl_proc_dointvec(&dummy,write,filp,buffer,lenp,ppos);
+ rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
}
SRETURN(rc);
}
-SPL_PROC_HANDLER(proc_console_backoff)
+static int
+proc_console_backoff(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc, backoff;
spl_ctl_table dummy = *table;
if (write) {
backoff = 0;
- rc = spl_proc_dointvec(&dummy,write,filp,buffer,lenp,ppos);
+ rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
if (rc < 0)
SRETURN(rc);
spl_console_backoff = backoff;
} else {
backoff = spl_console_backoff;
- rc = spl_proc_dointvec(&dummy,write,filp,buffer,lenp,ppos);
+ rc = proc_dointvec(&dummy, write, buffer, lenp, ppos);
}
SRETURN(rc);
#endif /* DEBUG_LOG */
#ifdef DEBUG_KMEM
-SPL_PROC_HANDLER(proc_domemused)
+static int
+proc_domemused(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc = 0;
unsigned long min = 0, max = ~0, val;
# else
val = atomic_read((atomic_t *)table->data);
# endif /* HAVE_ATOMIC64_T */
- rc = spl_proc_doulongvec_minmax(&dummy, write, filp,
- buffer, lenp, ppos);
+ rc = proc_doulongvec_minmax(&dummy, write, buffer, lenp, ppos);
}
SRETURN(rc);
}
-SPL_PROC_HANDLER(proc_doslab)
+static int
+proc_doslab(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc = 0;
unsigned long min = 0, max = ~0, val = 0, mask;
}
up_read(&spl_kmem_cache_sem);
- rc = spl_proc_doulongvec_minmax(&dummy, write, filp,
- buffer, lenp, ppos);
+ rc = proc_doulongvec_minmax(&dummy, write, buffer, lenp, ppos);
}
SRETURN(rc);
}
#endif /* DEBUG_KMEM */
-SPL_PROC_HANDLER(proc_dohostid)
+static int
+proc_dohostid(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int len, rc = 0;
char *end, str[32];
SENTRY;
if (write) {
- /* We can't use spl_proc_doulongvec_minmax() in the write
+ /* We can't use proc_doulongvec_minmax() in the write
* case here because hostid while a hex value has no
* leading 0x which confuses the helper function. */
rc = proc_copyin_string(str, sizeof(str), buffer, *lenp);
projects / spl / commitdiff