diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-10-27 14:38:00 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-10-27 14:38:00 +0000 |
| commit | 1f41d295fba2d409098181fe1212b0bbad862311 (patch) | |
| tree | ba2736123ed8400baf0cb45744b440c6e0eb456d /sys/fs | |
| parent | a3704ff4d46f150fc2e004a6f0f75c57047b967c (diff) | |
| download | FreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.zip FreeBSD-src-1f41d295fba2d409098181fe1212b0bbad862311.tar.gz | |
MFC r263710, r273377, r273378, r273423 and r273455:
- De-vnet hash sizes and hash masks.
- Fix multiple issues related to arguments passed to SYSCTL macros.
Sponsored by: Mellanox Technologies
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/devfs/devfs_devs.c | 4 | ||||
| -rw-r--r-- | sys/fs/fuse/fuse_main.c | 4 | ||||
| -rw-r--r-- | sys/fs/fuse/fuse_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdkrpc.c | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 6b6cf6e..e351ff8 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -109,10 +109,10 @@ SYSCTL_PROC(_kern, OID_AUTO, devname, NULL, 0, sysctl_devname, "", "devname(3) handler"); SYSCTL_INT(_debug_sizeof, OID_AUTO, cdev, CTLFLAG_RD, - 0, sizeof(struct cdev), "sizeof(struct cdev)"); + SYSCTL_NULL_INT_PTR, sizeof(struct cdev), "sizeof(struct cdev)"); SYSCTL_INT(_debug_sizeof, OID_AUTO, cdev_priv, CTLFLAG_RD, - 0, sizeof(struct cdev_priv), "sizeof(struct cdev_priv)"); + SYSCTL_NULL_INT_PTR, sizeof(struct cdev_priv), "sizeof(struct cdev_priv)"); struct cdev * devfs_alloc(int flags) diff --git a/sys/fs/fuse/fuse_main.c b/sys/fs/fuse/fuse_main.c index bf73a45f..d09e1c3 100644 --- a/sys/fs/fuse/fuse_main.c +++ b/sys/fs/fuse/fuse_main.c @@ -93,9 +93,9 @@ static struct vfsconf fuse_vfsconf = { }; SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD, - 0, FUSE_KERNEL_VERSION, "FUSE kernel abi major version"); + SYSCTL_NULL_INT_PTR, FUSE_KERNEL_VERSION, "FUSE kernel abi major version"); SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD, - 0, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version"); + SYSCTL_NULL_INT_PTR, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version"); /****************************** * diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index 0b4f19b..2ae9933 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -114,10 +114,10 @@ struct vfsops fuse_vfsops = { }; SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD, - 0, 1, "indicate async handshake"); + SYSCTL_NULL_INT_PTR, 1, "indicate async handshake"); static int fuse_enforce_dev_perms = 0; -SYSCTL_LONG(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, +SYSCTL_INT(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, &fuse_enforce_dev_perms, 0, "enforce fuse device permissions for secondary mounts"); static unsigned sync_unmount = 1; diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index d2145cc..3ed24ae 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -34,6 +34,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/param.h> +#include <sys/systm.h> + #include "opt_inet6.h" #include "opt_kgssapi.h" |
