Commit 325da967 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: uapi: move lustre_ioctl.h to uapi directory 



Move the header lustre_ioctl.h to proper uapi directory.

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/24568


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarBen Evans <bevans@cray.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 efd117be

drivers/staging/lustre/lustre/include/lustre/lustre_ioctl.h→drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h

+2 −3
Original line number Diff line number Diff line
@@ -29,13 +29,12 @@ 
#define LUSTRE_IOCTL_H_



#include <linux/types.h>

#include "../../../include/linux/libcfs/libcfs.h"

#include "lustre_idl.h"

#include "../../../linux/libcfs/libcfs.h"

#include "../../../../lustre/include/lustre/lustre_idl.h"



#ifdef __KERNEL__

# include <linux/ioctl.h>

# include <linux/string.h>

# include "../obd_support.h"

#else /* __KERNEL__ */

# include <malloc.h>

# include <string.h>

drivers/staging/lustre/lustre/llite/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


#include "../include/obd_support.h"

#include "../include/obd_class.h"

#include "../include/lustre/lustre_ioctl.h"

#include "../../include/uapi/linux/lustre/lustre_ioctl.h"

#include "../include/lustre_lib.h"

#include "../include/lustre_dlm.h"

#include "../include/lustre_fid.h"

drivers/staging/lustre/lustre/llite/file.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <linux/sched.h>

#include <linux/mount.h>

#include "../include/lustre/ll_fiemap.h"

#include "../include/lustre/lustre_ioctl.h"

#include "../../include/uapi/linux/lustre/lustre_ioctl.h"

#include "../include/lustre_swab.h"



#include "../include/cl_object.h"

drivers/staging/lustre/lustre/llite/llite_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <linux/types.h>

#include <linux/mm.h>



#include "../include/lustre/lustre_ioctl.h"

#include "../../include/uapi/linux/lustre/lustre_ioctl.h"

#include "../include/lustre_ha.h"

#include "../include/lustre_dlm.h"

#include "../include/lprocfs_status.h"

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include "../include/lprocfs_status.h"

#include "../include/cl_object.h"

#include "../include/lustre_fid.h"

#include "../include/lustre/lustre_ioctl.h"

#include "../../include/uapi/linux/lustre/lustre_ioctl.h"

#include "../include/lustre_kernelcomm.h"

#include "lmv_internal.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE