c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove proc_handler() wrapper

Browse Source 
As of Linux 2.6.32 the proc handlers where updated to expect only
five arguments.  Therefore there is no longer a need to maintain
this compatibility code and this infrastructure can be simplified.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf
2014-10-02 14:15:19 -04:00
parent e03119e86f
commit 0fac9c9e6d
5 changed files with 39 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/Makefile.am
-1
View File
@@ -11,7 +11,6 @@ KERNEL_H = \
$(top_srcdir)/include/linux/module_compat.h \
$(top_srcdir)/include/linux/proc_compat.h \
$(top_srcdir)/include/linux/rwsem_compat.h \
$(top_srcdir)/include/linux/sysctl_compat.h \
$(top_srcdir)/include/linux/wait_compat.h \
$(top_srcdir)/include/linux/zlib_compat.h
include/linux/sysctl_compat.h
-96
View File
@@ -1,96 +0,0 @@
/*****************************************************************************\
* 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 */