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

staging: lustre: lustre: cleanup paths for lustre UAPI headers 



Rationalize include paths for the lustre uapi headers

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c355a7a

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 "../../../uapi/linux/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 "../../../uapi/linux/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/include/uapi/linux/lustre/lustre_idl.h

+3 −3
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ 
#include <asm/byteorder.h>

#include <linux/types.h>



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

#include <uapi/linux/lnet/lnet-types.h>

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

#include "lustre_user.h"

#include "lustre_ver.h"

#include <uapi/linux/lustre/lustre_user.h>

#include <uapi/linux/lustre/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 "../../../uapi/linux/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.

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

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



#include <linux/errno.h>

#include "lustre_fid.h"

#include <uapi/linux/lustre/lustre_fid.h>



static inline __u64 lmm_oi_id(const struct ost_id *oi)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE