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

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

Move lustre_cfg.h to its proper place. Adjust additonal headers
included in lustre_cfg.h.
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/26966Reviewed-by: default avatarQuentin Bouget <quentin.bouget@cea.fr>
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 4599c8eb
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
#ifndef _LUSTRE_CFG_H #ifndef _LUSTRE_CFG_H
#define _LUSTRE_CFG_H #define _LUSTRE_CFG_H
#include "../../../../lustre/include/lustre/lustre_user.h"
/** \defgroup cfg cfg /** \defgroup cfg cfg
* *
* @{ * @{
...@@ -191,8 +193,6 @@ static inline __u32 lustre_cfg_len(__u32 bufcount, __u32 *buflens) ...@@ -191,8 +193,6 @@ static inline __u32 lustre_cfg_len(__u32 bufcount, __u32 *buflens)
return cfs_size_round(len); return cfs_size_round(len);
} }
#include "obd_support.h"
static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd, static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd,
struct lustre_cfg_bufs *bufs) struct lustre_cfg_bufs *bufs)
{ {
...@@ -238,8 +238,6 @@ static inline int lustre_cfg_sanity_check(void *buf, size_t len) ...@@ -238,8 +238,6 @@ static inline int lustre_cfg_sanity_check(void *buf, size_t len)
return 0; return 0;
} }
#include "lustre/lustre_user.h"
/** @} cfg */ /** @} cfg */
#endif /* _LUSTRE_CFG_H */ #endif /* _LUSTRE_CFG_H */
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <linux/types.h> #include <linux/types.h>
#include "../../include/linux/libcfs/libcfs.h" #include "../../include/linux/libcfs/libcfs.h"
#include "lustre_cfg.h" #include "../../include/uapi/linux/lustre/lustre_cfg.h"
#include "lustre/lustre_idl.h" #include "lustre/lustre_idl.h"
struct lprocfs_vars { struct lprocfs_vars {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "../../include/linux/libcfs/libcfs.h" #include "../../include/linux/libcfs/libcfs.h"
#include "lustre/lustre_idl.h" #include "lustre/lustre_idl.h"
#include "lustre_ver.h" #include "lustre_ver.h"
#include "lustre_cfg.h" #include "../../include/uapi/linux/lustre/lustre_cfg.h"
/* target.c */ /* target.c */
struct ptlrpc_request; struct ptlrpc_request;
......
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