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

Linux compat: Grsecurity kernel

Browse Source 
API Change: Module parameter set/get methods take const parameter in
Grsecurity kernel v4.7.1

Signed-off-by: Gvozden Neskovic <neskovic@gmail.com>
Signed-off-by: Jason Zaman <jason@perfinion.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4997
Closes #5001
This commit is contained in:
Gvozden Neskovic
2016-08-21 21:29:49 +02:00
committed by Brian Behlendorf
parent 2bce8049c3
commit 9cc1844a1d
6 changed files with 84 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zcommon/zfs_fletcher.c
+3 -2
View File
@@ -653,9 +653,10 @@ fletcher_4_fini(void)
}
#if defined(_KERNEL) && defined(HAVE_SPL)
#include <linux/mod_compat.h>
static int
fletcher_4_param_get(char *buffer, struct kernel_param *unused)
fletcher_4_param_get(char *buffer, zfs_kernel_param_t *unused)
{
const uint32_t impl = IMPL_READ(fletcher_4_impl_chosen);
char *fmt;
@@ -676,7 +677,7 @@ fletcher_4_param_get(char *buffer, struct kernel_param *unused)
}
static int
fletcher_4_param_set(const char *val, struct kernel_param *unused)
fletcher_4_param_set(const char *val, zfs_kernel_param_t *unused)
{
return (fletcher_4_impl_set(val));
}
module/zfs/vdev_raidz_math.c
+9 -10
View File
@@ -120,7 +120,6 @@ vdev_raidz_math_get_ops()
ops = (raidz_impl_ops_t *) &vdev_raidz_scalar_impl;
break;
default:
ASSERT(raidz_math_initialized);
ASSERT3U(impl, <, raidz_supp_impl_cnt);
ASSERT3U(raidz_supp_impl_cnt, >, 0);
ops = raidz_supp_impl[impl];
@@ -556,8 +555,8 @@ static const struct {
* @val Name of raidz implementation to use
* @param Unused.
*/
static int
zfs_vdev_raidz_impl_set(const char *val, struct kernel_param *kp)
int
vdev_raidz_impl_set(const char *val)
{
int err = -EINVAL;
char req_name[RAIDZ_IMPL_NAME_MAX];
@@ -605,17 +604,17 @@ zfs_vdev_raidz_impl_set(const char *val, struct kernel_param *kp)
return (err);
}
int
vdev_raidz_impl_set(const char *val)
{
ASSERT(raidz_math_initialized);
#if defined(_KERNEL) && defined(HAVE_SPL)
#include <linux/mod_compat.h>
return (zfs_vdev_raidz_impl_set(val, NULL));
static int
zfs_vdev_raidz_impl_set(const char *val, zfs_kernel_param_t *kp)
{
return (vdev_raidz_impl_set(val));
}
#if defined(_KERNEL) && defined(HAVE_SPL)
static int
zfs_vdev_raidz_impl_get(char *buffer, struct kernel_param *kp)
zfs_vdev_raidz_impl_get(char *buffer, zfs_kernel_param_t *kp)
{
int i, cnt = 0;
char *fmt;