Commit 72c5290b authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: uapi: remove CONFIG_LUSTRE_OBD_MAX_IOCTL

Now that lustre_ioctl.h is a UAPI header the kernel configuration
option CONFIG_LUSTRE_OBD_MAX_IOCTL needs to be remove. The user
land utilites will no longer be able to see this option and
actually they never used this option before. Since this is the
case setting the kernel configuration to something other than
8K could actually break things. The best option is just hard
code it to 8K.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/25246Reviewed-by: default avatarQuentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: default avatarBen Evans <bevans@cray.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e86a6151
...@@ -56,7 +56,6 @@ enum md_echo_cmd { ...@@ -56,7 +56,6 @@ enum md_echo_cmd {
#define OBD_IOCTL_VERSION 0x00010004 #define OBD_IOCTL_VERSION 0x00010004
#define OBD_DEV_BY_DEVNAME 0xffffd0de #define OBD_DEV_BY_DEVNAME 0xffffd0de
#define OBD_MAX_IOCTL_BUFFER CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
struct obd_ioctl_data { struct obd_ioctl_data {
__u32 ioc_len; __u32 ioc_len;
......
...@@ -31,16 +31,6 @@ config LUSTRE_FS ...@@ -31,16 +31,6 @@ config LUSTRE_FS
See also http://wiki.lustre.org/ See also http://wiki.lustre.org/
config LUSTRE_OBD_MAX_IOCTL_BUFFER
int "Lustre obd max ioctl buffer bytes (default 8KB)"
depends on LUSTRE_FS
default 8192
help
This option defines the maximum size of buffer in bytes that user space
applications can pass to Lustre kernel module through ioctl interface.
If unsure, use default.
config LUSTRE_DEBUG_EXPENSIVE_CHECK config LUSTRE_DEBUG_EXPENSIVE_CHECK
bool "Enable Lustre DEBUG checks" bool "Enable Lustre DEBUG checks"
depends on LUSTRE_FS depends on LUSTRE_FS
......
...@@ -68,6 +68,8 @@ ...@@ -68,6 +68,8 @@
#include "../../../include/uapi/linux/lustre/lustre_ioctl.h" #include "../../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../../../include/uapi/linux/lustre/lustre_ver.h" #include "../../../include/uapi/linux/lustre/lustre_ver.h"
#define OBD_MAX_IOCTL_BUFFER 8192
static int obd_ioctl_is_invalid(struct obd_ioctl_data *data) static int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
{ {
if (data->ioc_len > BIT(30)) { if (data->ioc_len > BIT(30)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment