Move lustre_cfg.h to its proper place. Adjust additonal headers included in lustre_cfg.h. Signed-off-by: James Simmons <uja.ornl@xxxxxxxxx> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6401 Reviewed-on: https://review.whamcloud.com/26966 Reviewed-by: Quentin Bouget <quentin.bouget@xxxxxx> Reviewed-by: Ben Evans <bevans@xxxxxxxx> Reviewed-by: Oleg Drokin <oleg.drokin@xxxxxxxxx> Signed-off-by: James Simmons <jsimmons@xxxxxxxxxxxxx> --- .../{lustre/include => include/uapi/linux/lustre}/lustre_cfg.h | 6 ++---- drivers/staging/lustre/lustre/include/lprocfs_status.h | 2 +- drivers/staging/lustre/lustre/include/lustre_lib.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) rename drivers/staging/lustre/{lustre/include => include/uapi/linux/lustre}/lustre_cfg.h (99%) diff --git a/drivers/staging/lustre/lustre/include/lustre_cfg.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h similarity index 99% rename from drivers/staging/lustre/lustre/include/lustre_cfg.h rename to drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h index 21a48b1..a762aab 100644 --- a/drivers/staging/lustre/lustre/include/lustre_cfg.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h @@ -33,6 +33,8 @@ #ifndef _LUSTRE_CFG_H #define _LUSTRE_CFG_H +#include "../../../../lustre/include/lustre/lustre_user.h" + /** \defgroup cfg cfg * * @{ @@ -191,8 +193,6 @@ static inline __u32 lustre_cfg_len(__u32 bufcount, __u32 *buflens) return cfs_size_round(len); } -#include "obd_support.h" - static inline void lustre_cfg_init(struct lustre_cfg *lcfg, int cmd, struct lustre_cfg_bufs *bufs) { @@ -238,8 +238,6 @@ static inline int lustre_cfg_sanity_check(void *buf, size_t len) return 0; } -#include "lustre/lustre_user.h" - /** @} cfg */ #endif /* _LUSTRE_CFG_H */ diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h index 9054d37..694062a 100644 --- a/drivers/staging/lustre/lustre/include/lprocfs_status.h +++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h @@ -44,7 +44,7 @@ #include <linux/types.h> #include "../../include/linux/libcfs/libcfs.h" -#include "lustre_cfg.h" +#include "../../include/uapi/linux/lustre/lustre_cfg.h" #include "lustre/lustre_idl.h" struct lprocfs_vars { diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h index f24970d..c68dd5d 100644 --- a/drivers/staging/lustre/lustre/include/lustre_lib.h +++ b/drivers/staging/lustre/lustre/include/lustre_lib.h @@ -48,7 +48,7 @@ #include "../../include/linux/libcfs/libcfs.h" #include "lustre/lustre_idl.h" #include "lustre_ver.h" -#include "lustre_cfg.h" +#include "../../include/uapi/linux/lustre/lustre_cfg.h" /* target.c */ struct ptlrpc_request; -- 1.8.3.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
