diff options
| author |   James Simmons <jsimmons@infradead.org> | 2017-08-19 22:26:08 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-22 18:36:48 -0700 |
| commit | 3f443e003edd4056bd23214d883f78b6bca5ac1d (patch) | |
| tree | 5efe77e3778d5f5ad05f4d181d4a647660821e4b /drivers/staging/lustre | |
| parent | staging: lustre: uapi: use __ALIGN_KERNEL for lustre_ioctl.h (diff) | |
| download | linux-dev-3f443e003edd4056bd23214d883f78b6bca5ac1d.tar.xz linux-dev-3f443e003edd4056bd23214d883f78b6bca5ac1d.zip | |
staging: lustre: uapi: cleanup headers for lustre_ioctl.h
With the cleanups we no longer need to drag in tons of
user land headers. Lets simplify the include headers.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401
Reviewed-on: https://review.whamcloud.com/24568
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Ben Evans <bevans@cray.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h index a7e2fc4bbe1e..fb87a8b1de4e 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h @@ -28,19 +28,11 @@ #ifndef LUSTRE_IOCTL_H_ #define LUSTRE_IOCTL_H_ +#include <linux/ioctl.h> #include <linux/kernel.h> #include <linux/types.h> #include "../../../../lustre/include/lustre/lustre_idl.h" -#ifdef __KERNEL__ -# include <linux/ioctl.h> -# include <linux/string.h> -#else /* __KERNEL__ */ -# include <malloc.h> -# include <string.h> -#include <libcfs/util/ioctl.h> -#endif /* !__KERNEL__ */ - #if !defined(__KERNEL__) && !defined(LUSTRE_UTILS) # error This file is for Lustre internal use only. #endif |