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

staging: lustre: uapi: migrate remaining uapi headers to uapi directory 



Move all the remaining lustre headers shared between user land
and kernel space to the 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/25246


Reviewed-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 1c07bedf

drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h

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


#include <linux/errno.h>

#include <linux/kernel.h>

#include "../../../../lustre/include/lustre/lustre_user.h"

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



/** \defgroup cfg cfg

 *

drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#ifndef _UAPI_LUSTRE_FID_H_

#define _UAPI_LUSTRE_FID_H_



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

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



/** returns fid object sequence */

static inline __u64 fid_seq(const struct lu_fid *fid)

drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h→drivers/staging/lustre/include/uapi/linux/lustre/lustre_fiemap.h

+1 −5
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * lustre/include/lustre/ll_fiemap.h

 *

 * FIEMAP data structures and flags. This header file will be used until

 * fiemap.h is available in the upstream kernel.

 *
@@ -41,10 +39,8 @@ 
#ifndef _LUSTRE_FIEMAP_H

#define _LUSTRE_FIEMAP_H



#ifndef __KERNEL__

#include <stddef.h>

#include <fiemap.h>

#endif

#include <linux/fiemap.h>



/* XXX: We use fiemap_extent::fe_reserved[0] */

#define fe_device	fe_reserved[0]

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

+2 −4
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * lustre/include/lustre/lustre_idl.h

 *

 * Lustre wire protocol definitions.

 */
@@ -71,10 +69,10 @@ 


#include <linux/types.h>



#include "../../../include/uapi/linux/lnet/lnet-types.h"

#include "../lnet/lnet-types.h"

/* Defn's shared with user-space. */

#include "lustre_user.h"

#include "../lustre_ver.h"

#include "lustre_ver.h"



/*

 *  GENERAL STUFF

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

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

#include <linux/kernel.h>

#include <linux/types.h>

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

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



#if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)

# error This file is for Lustre internal use only.

CRA Git | Maintained and supported by SUSTech CRA and CCSE