Commit 1accaadf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: lustre: fix include relative paths

In drivers/staging/lustre/lustre/include there was a bunch of .h files
relying on ccflags to be set up right.  Make all of them proper relative
paths so that ccflags for different subdirs can be now removed.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da0e6a7a
......@@ -97,10 +97,10 @@
/*
* super-class definitions.
*/
#include <lu_object.h>
#include <lvfs.h>
# include <linux/mutex.h>
# include <linux/radix-tree.h>
#include "lu_object.h"
#include "lvfs.h"
#include <linux/mutex.h>
#include <linux/radix-tree.h>
struct inode;
......
......@@ -53,7 +53,7 @@
/*
* super-class definitions.
*/
#include <lu_object.h>
#include "lu_object.h"
#include "../../include/linux/libcfs/libcfs.h"
......
......@@ -50,7 +50,7 @@
#include <linux/seq_file.h>
#include <linux/smp.h>
#include <linux/rwsem.h>
#include "../../include/linux/libcfs/libcfs.h"
#include "../../../include/linux/libcfs/libcfs.h"
#include <linux/statfs.h>
......
......@@ -56,7 +56,7 @@
(sizeof(posix_acl_xattr_header) + \
LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
#include <linux/lustre_intent.h>
#include "lustre_intent.h"
#include <linux/xattr.h> /* XATTR_{REPLACE,CREATE} */
#ifndef LUSTRE_POSIX_ACL_MAX_SIZE
......
......@@ -41,7 +41,7 @@
#include <linux/namei.h>
#include "../../../include/linux/libcfs/linux/portals_compat25.h"
#include <linux/lustre_patchless_compat.h>
#include "lustre_patchless_compat.h"
# define LOCK_FS_STRUCT(fs) spin_lock(&(fs)->lock)
# define UNLOCK_FS_STRUCT(fs) spin_unlock(&(fs)->lock)
......
......@@ -46,8 +46,8 @@
#endif
#include <obd.h>
#include <obd_class.h>
#include "../obd.h"
#include "../obd_class.h"
typedef void (*fsfilt_cb_t)(struct obd_device *obd, __u64 last_rcvd,
void *data, int error);
......
......@@ -49,8 +49,8 @@
# include <linux/sched.h>
# include <linux/signal.h>
# include <linux/types.h>
# include <linux/lustre_compat25.h>
# include <linux/lustre_common.h>
#include "lustre_compat25.h"
#include "lustre_common.h"
#ifndef LP_POISON
# define LI_POISON 0x5a5a5a5a
......
......@@ -46,9 +46,9 @@
#include <linux/dcache.h>
#include <linux/proc_fs.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_ha.h>
#include "../obd_class.h"
#include "../lustre_net.h"
#include "../lustre_ha.h"
#include <linux/rbtree.h>
#include <linux/lustre_compat25.h>
......
......@@ -45,9 +45,9 @@
#error Do not #include this file directly. #include <lvfs.h> instead
#endif
#include <linux/lustre_compat25.h>
#include <linux/lustre_common.h>
#include <linux/lvfs_linux.h>
#include "lustre_compat25.h"
#include "lustre_common.h"
#include "lvfs_linux.h"
#define LLOG_LVFS
......
......@@ -41,7 +41,7 @@
#include <linux/namei.h>
#include <linux/sched.h>
#include <lvfs.h>
#include "../lvfs.h"
#define l_file file
#define l_dentry dentry
......
......@@ -41,14 +41,14 @@
#error Do not #include this file directly. #include <obd.h> instead
#endif
#include <obd_support.h>
#include "../obd_support.h"
# include <linux/fs.h>
# include <linux/list.h>
# include <linux/sched.h> /* for struct task_struct, for current.h */
# include <linux/proc_fs.h>
# include <linux/mount.h>
# include <linux/lustre_intent.h>
#include "lustre_intent.h"
struct ll_iattr {
struct iattr iattr;
......
......@@ -50,14 +50,14 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#include <linux/swap.h>
#include <linux/lustre_compat25.h>
#include <linux/lustre_common.h>
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_idl.h>
#include "../../include/linux/lustre_compat25.h"
#include "lustre_common.h"
#include "../../../include/linux/libcfs/libcfs.h"
#include "../lustre/lustre_idl.h"
# include <linux/types.h>
# include <linux/blkdev.h>
# include <lvfs.h>
# include "../lvfs.h"
#endif
......@@ -42,8 +42,8 @@
#ifndef _LPROCFS_SNMP_H
#define _LPROCFS_SNMP_H
#include <linux/lprocfs_status.h>
#include <lustre/lustre_idl.h>
#include "linux/lprocfs_status.h"
#include "lustre/lustre_idl.h"
#include "../../include/linux/libcfs/params_tree.h"
struct lprocfs_vars {
......
......@@ -39,8 +39,8 @@
#include <stdarg.h>
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_idl.h>
#include <lu_ref.h>
#include "lustre/lustre_idl.h"
#include "lu_ref.h"
struct seq_file;
struct proc_dir_entry;
......
......@@ -96,9 +96,8 @@
#endif
/* Defn's shared with user-space. */
#include <lustre/lustre_user.h>
#include <lustre/lustre_errno.h>
#include "lustre_user.h"
#include "lustre_errno.h"
/*
* GENERAL STUFF
......
......@@ -46,8 +46,8 @@
* @{
*/
#include <lustre/ll_fiemap.h>
#include <linux/lustre_user.h>
#include "ll_fiemap.h"
#include "../linux/lustre_user.h"
/* for statfs() */
#define LL_SUPER_MAGIC 0x0BD00BD0
......
......@@ -50,7 +50,7 @@
* capability
*/
#include <linux/crypto.h>
#include <lustre/lustre_idl.h>
#include "lustre/lustre_idl.h"
#define CAPA_TIMEOUT 1800 /* sec, == 30 min */
#define CAPA_KEY_TIMEOUT (24 * 60 * 60) /* sec, == 1 days */
......
......@@ -222,7 +222,7 @@ static inline int lustre_cfg_len(__u32 bufcount, __u32 *buflens)
}
#include <obd_support.h>
#include "obd_support.h"
static inline struct lustre_cfg *lustre_cfg_new(int cmd,
struct lustre_cfg_bufs *bufs)
......@@ -286,7 +286,7 @@ static inline int lustre_cfg_sanity_check(void *buf, int len)
return 0;
}
#include <lustre/lustre_user.h>
#include "lustre/lustre_user.h"
/** @} cfg */
......
......@@ -42,8 +42,8 @@
* @{
*/
#include <lustre_net.h>
#include <obd.h>
#include "lustre_net.h"
#include "obd.h"
/* lib/debug.c */
void dump_lniobuf(struct niobuf_local *lnb);
......
......@@ -48,14 +48,14 @@
#ifndef _LUSTRE_DLM_H__
#define _LUSTRE_DLM_H__
#include <linux/lustre_dlm.h>
#include <lustre_lib.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_handles.h>
#include <interval_tree.h> /* for interval_node{}, ldlm_extent */
#include <lu_ref.h>
#include "linux/lustre_dlm.h"
#include "lustre_lib.h"
#include "lustre_net.h"
#include "lustre_import.h"
#include "lustre_handles.h"
#include "interval_tree.h" /* for interval_node{}, ldlm_extent */
#include "lu_ref.h"
#include "lustre_dlm_flags.h"
......
......@@ -46,9 +46,9 @@
* @{
*/
#include <lprocfs_status.h>
#include <lustre/lustre_idl.h>
#include <lustre_dlm.h>
#include "lprocfs_status.h"
#include "lustre/lustre_idl.h"
#include "lustre_dlm.h"
struct mds_client_data;
struct mdt_client_data;
......
......@@ -153,7 +153,7 @@
*/
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_idl.h>
#include "lustre/lustre_idl.h"
struct lu_env;
struct lu_site;
......
......@@ -42,7 +42,7 @@
* @{
*/
#include <lustre/lustre_idl.h>
#include "lustre/lustre_idl.h"
#include "../../include/linux/libcfs/libcfs.h"
struct lu_client_fld;
......
......@@ -42,7 +42,7 @@
* @{
*/
#include <linux/lustre_handles.h>
#include "linux/lustre_handles.h"
#include "../../include/linux/libcfs/libcfs.h"
......
......@@ -47,8 +47,8 @@
* @{
*/
#include <lustre_handles.h>
#include <lustre/lustre_idl.h>
#include "lustre_handles.h"
#include "lustre/lustre_idl.h"
/**
......
......@@ -47,19 +47,19 @@
*/
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_idl.h>
#include <lustre_ver.h>
#include <lustre_cfg.h>
#include <linux/lustre_lib.h>
#include "lustre/lustre_idl.h"
#include "lustre_ver.h"
#include "lustre_cfg.h"
#include "linux/lustre_lib.h"
/* target.c */
struct ptlrpc_request;
struct obd_export;
struct lu_target;
struct l_wait_info;
#include <lustre_ha.h>
#include <lustre_net.h>
#include <lvfs.h>
#include "lustre_ha.h"
#include "lustre_net.h"
#include "lvfs.h"
int target_pack_pool_reply(struct ptlrpc_request *req);
......@@ -241,7 +241,7 @@ static inline int obd_ioctl_is_invalid(struct obd_ioctl_data *data)
}
#include <obd_support.h>
#include "obd_support.h"
/* function defined in lustre/obdclass/<platform>/<platform>-module.c */
int obd_ioctl_getdata(char **buf, int *len, void *arg);
......
......@@ -42,19 +42,19 @@
* @{
*/
#include <linux/lustre_lite.h>
#include "linux/lustre_lite.h"
#include <obd_class.h>
#include <obd_ost.h>
#include <lustre_net.h>
#include <lustre_mds.h>
#include <lustre_ha.h>
#include "obd_class.h"
#include "obd_ost.h"
#include "lustre_net.h"
#include "lustre_mds.h"
#include "lustre_ha.h"
/* 4UL * 1024 * 1024 */
#define LL_MAX_BLKSIZE_BITS (22)
#define LL_MAX_BLKSIZE (1UL<<LL_MAX_BLKSIZE_BITS)
#include <lustre/lustre_user.h>
#include "lustre/lustre_user.h"
struct lustre_rw_params {
......
......@@ -56,12 +56,12 @@
* @{
*/
#include <linux/lustre_log.h>
#include "linux/lustre_log.h"
#include <obd_class.h>
#include <obd_ost.h>
#include <lustre/lustre_idl.h>
#include <dt_object.h>
#include "obd_class.h"
#include "obd_ost.h"
#include "lustre/lustre_idl.h"
#include "dt_object.h"
#define LOG_NAME_LIMIT(logname, name) \
snprintf(logname, sizeof(logname), "LOGS/%s", name)
......
......@@ -50,14 +50,14 @@
#include <linux/fs.h>
#include <linux/dcache.h>
#include <linux/lustre_intent.h>
#include <lustre_handles.h>
#include "linux/lustre_intent.h"
#include "lustre_handles.h"
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_class.h>
#include <lustre/lustre_idl.h>
#include <lustre_lib.h>
#include <lustre_dlm.h>
#include <lustre_export.h>
#include "obd_class.h"
#include "lustre/lustre_idl.h"
#include "lustre_lib.h"
#include "lustre_dlm.h"
#include "lustre_export.h"
struct ptlrpc_client;
struct obd_export;
......
......@@ -47,12 +47,12 @@
* @{
*/
#include <lustre_handles.h>
#include "lustre_handles.h"
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_idl.h>
#include <lustre_lib.h>
#include <lustre_dlm.h>
#include <lustre_export.h>
#include "lustre/lustre_idl.h"
#include "lustre_lib.h"
#include "lustre_dlm.h"
#include "lustre_export.h"
struct mds_group_info {
struct obd_uuid *uuid;
......
......@@ -55,21 +55,21 @@
* @{
*/
#include <linux/lustre_net.h>
#include "linux/lustre_net.h"
#include "../../include/linux/libcfs/libcfs.h"
// #include <obd.h>
#include "../../include/linux/lnet/lnet.h"
#include <lustre/lustre_idl.h>
#include <lustre_ha.h>
#include <lustre_sec.h>
#include <lustre_import.h>
#include <lprocfs_status.h>
#include <lu_object.h>
#include <lustre_req_layout.h>
#include <obd_support.h>
#include <lustre_ver.h>
#include "lustre/lustre_idl.h"
#include "lustre_ha.h"
#include "lustre_sec.h"
#include "lustre_import.h"
#include "lprocfs_status.h"
#include "lu_object.h"
#include "lustre_req_layout.h"
#include "obd_support.h"
#include "lustre_ver.h"
/* MD flags we _always_ use */
#define PTLRPC_MD_OPTIONS 0
......
......@@ -32,11 +32,11 @@
*
*/
#include <linux/lustre_quota.h>
#include "linux/lustre_quota.h"
#include <dt_object.h>
#include <lustre_fid.h>
#include <lustre_dlm.h>
#include "dt_object.h"
#include "lustre_fid.h"
#include "lustre_dlm.h"
#ifndef MAX_IQ_TIME
#define MAX_IQ_TIME 604800 /* (7*24*60*60) 1 week */
......
......@@ -73,7 +73,7 @@ struct req_capsule {
#if !defined(__REQ_LAYOUT_USER__)
/* struct ptlrpc_request, lustre_msg* */
#include <lustre_net.h>
#include "lustre_net.h"
void req_capsule_init(struct req_capsule *pill, struct ptlrpc_request *req,
enum req_location location);
......
......@@ -42,7 +42,7 @@
#define LL_FID_NAMELEN (16 + 1 + 8 + 1)
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/lvfs.h>
#include "linux/lvfs.h"
#include "../../include/linux/libcfs/lucache.h"
......
......@@ -56,7 +56,7 @@
/*
* super-class definitions.
*/
#include <dt_object.h>
#include "dt_object.h"
struct md_device;
struct md_device_operations;
......
......@@ -37,7 +37,7 @@
#ifndef __OBD_H
#define __OBD_H
#include <linux/obd.h>
#include "linux/obd.h"
#define IOC_OSC_TYPE 'h'
#define IOC_OSC_MIN_NR 20
......@@ -48,14 +48,14 @@
#define IOC_MDC_MIN_NR 20
#define IOC_MDC_MAX_NR 50
#include <lustre/lustre_idl.h>
#include <lustre_lib.h>
#include "lustre/lustre_idl.h"
#include "lustre_lib.h"
#include "../../include/linux/libcfs/bitmap.h"
#include <lu_ref.h>
#include <lustre_export.h>
#include <lustre_fid.h>
#include <lustre_fld.h>
#include <lustre_capa.h>
#include "lu_ref.h"
#include "lustre_export.h"
#include "lustre_fid.h"
#include "lustre_fld.h"
#include "lustre_capa.h"
#define MAX_OBD_DEVICES 8192
......
......@@ -35,7 +35,7 @@
#ifndef __OBD_CKSUM
#define __OBD_CKSUM
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_idl.h>
#include "lustre/lustre_idl.h"
static inline unsigned char cksum_obd2cfs(cksum_type_t cksum_type)
{
......
......@@ -37,15 +37,15 @@
#define __CLASS_OBD_H
#include <obd_support.h>
#include <lustre_import.h>
#include <lustre_net.h>
#include <obd.h>
#include <lustre_lib.h>
#include <lustre/lustre_idl.h>
#include <lprocfs_status.h>
#include <linux/obd_class.h>
#include "obd_support.h"
#include "lustre_import.h"
#include "lustre_net.h"
#include "obd.h"
#include "lustre_lib.h"
#include "lustre/lustre_idl.h"
#include "lprocfs_status.h"
#include "linux/obd_class.h"
#define OBD_STATFS_NODELAY 0x0001 /* requests should be send without delay
* and resends for avoid deadlocks */
......
......@@ -43,7 +43,7 @@
#ifndef _LUSTRE_OST_H
#define _LUSTRE_OST_H
#include <obd_class.h>
#include "obd_class.h"
struct osc_brw_async_args {
struct obdo *aa_oa;
......
......@@ -38,10 +38,9 @@
#define _OBD_SUPPORT
#include "../../include/linux/libcfs/libcfs.h"
#include <lvfs.h>
#include <lprocfs_status.h>
#include <linux/obd_support.h>
#include "lvfs.h"
#include "lprocfs_status.h"
#include "linux/obd_support.h"
/* global variables */
extern struct lprocfs_stats *obd_memory;
......
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