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

staging: lustre: obdclass: add include path to Makefile

Rationalize include paths in the obdclass source code files.
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e270b30
subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
obj-$(CONFIG_LUSTRE_FS) += obdclass.o
obdclass-y := linux/linux-module.o linux/linux-sysctl.o \
......
......@@ -37,12 +37,12 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_fid.h"
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_fid.h>
#include <linux/list.h>
#include <linux/sched.h>
#include "../include/cl_object.h"
#include <cl_object.h>
#include "cl_internal.h"
/*****************************************************************************
......
......@@ -37,11 +37,11 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_fid.h"
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_fid.h>
#include <linux/list.h>
#include "../include/cl_object.h"
#include <cl_object.h>
#include "cl_internal.h"
static void cl_lock_trace0(int level, const struct lu_env *env,
......
......@@ -46,15 +46,15 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/libcfs/libcfs.h>
/* class_put_type() */
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_fid.h"
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_fid.h>
#include <linux/list.h>
#include "../../include/linux/libcfs/libcfs_hash.h" /* for cfs_hash stuff */
#include "../include/cl_object.h"
#include "../include/lu_object.h"
#include <linux/libcfs/libcfs_hash.h> /* for cfs_hash stuff */
#include <cl_object.h>
#include <lu_object.h>
#include "cl_internal.h"
static struct kmem_cache *cl_env_kmem;
......
......@@ -37,12 +37,12 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../../include/linux/libcfs/libcfs.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include <linux/libcfs/libcfs.h>
#include <obd_class.h>
#include <obd_support.h>
#include <linux/list.h>
#include "../include/cl_object.h"
#include <cl_object.h>
#include "cl_internal.h"
static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg);
......
......@@ -33,14 +33,14 @@
#define DEBUG_SUBSYSTEM S_CLASS
# include <linux/atomic.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../../include/uapi/linux/lnet/lnetctl.h"
#include "../include/lustre_debug.h"
#include "../include/lprocfs_status.h"
#include <obd_support.h>
#include <obd_class.h>
#include <uapi/linux/lnet/lnetctl.h>
#include <lustre_debug.h>
#include <lprocfs_status.h>
#include <linux/list.h>
#include "../include/cl_object.h"
#include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include <cl_object.h>
#include <uapi/linux/lustre/lustre_ioctl.h>
#include "llog_internal.h"
struct obd_device *obd_devs[MAX_OBD_DEVICES];
......
......@@ -38,9 +38,9 @@
#include <asm/unaligned.h>
#include "../include/obd_support.h"
#include "../include/lustre_debug.h"
#include "../include/lustre_net.h"
#include <obd_support.h>
#include <lustre_debug.h>
#include <lustre_net.h>
#define LPDS sizeof(__u64)
int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
......
......@@ -36,9 +36,9 @@
*/
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_class.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_kernelcomm.h"
#include <obd_class.h>
#include <lprocfs_status.h>
#include <lustre_kernelcomm.h>
spinlock_t obd_types_lock;
......
......@@ -38,8 +38,8 @@
#define DEBUG_SUBSYSTEM S_CLASS
#define D_KUC D_OTHER
#include "../include/obd_support.h"
#include "../include/lustre_kernelcomm.h"
#include <obd_support.h>
#include <lustre_kernelcomm.h>
/**
* libcfs_kkuc_msg_put - send an message from kernel to userspace
......
......@@ -26,9 +26,9 @@
* Author: Di Wang <di.wang@intel.com>
*/
#include "../../include/uapi/linux/lustre/lustre_idl.h"
#include "../include/obd.h"
#include "../include/lustre_linkea.h"
#include <uapi/linux/lustre/lustre_idl.h>
#include <obd.h>
#include <lustre_linkea.h>
int linkea_data_new(struct linkea_data *ldata, struct lu_buf *buf)
{
......
......@@ -60,13 +60,13 @@
#include <linux/seq_file.h>
#include <linux/kobject.h>
#include "../../../include/linux/libcfs/libcfs.h"
#include "../../../include/uapi/linux/lnet/lnetctl.h"
#include "../../include/obd_support.h"
#include "../../include/obd_class.h"
#include "../../include/lprocfs_status.h"
#include "../../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../../../include/uapi/linux/lustre/lustre_ver.h"
#include <linux/libcfs/libcfs.h>
#include <uapi/linux/lnet/lnetctl.h>
#include <obd_support.h>
#include <obd_class.h>
#include <lprocfs_status.h>
#include <uapi/linux/lustre/lustre_ioctl.h>
#include <uapi/linux/lustre/lustre_ver.h>
#define OBD_MAX_IOCTL_BUFFER 8192
......
......@@ -43,9 +43,9 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../../include/obd_support.h"
#include "../../include/lprocfs_status.h"
#include "../../include/obd_class.h"
#include <obd_support.h>
#include <lprocfs_status.h>
#include <obd_class.h>
struct static_lustre_uintvalue_attr {
struct {
......
......@@ -43,9 +43,9 @@
#define DEBUG_SUBSYSTEM S_LOG
#include "../include/llog_swab.h"
#include "../include/lustre_log.h"
#include "../include/obd_class.h"
#include <llog_swab.h>
#include <lustre_log.h>
#include <obd_class.h>
#include "llog_internal.h"
/*
......
......@@ -44,7 +44,7 @@
#define DEBUG_SUBSYSTEM S_LOG
#include "../include/obd_class.h"
#include <obd_class.h>
#include "llog_internal.h"
......
......@@ -33,7 +33,7 @@
#ifndef __LLOG_INTERNAL_H__
#define __LLOG_INTERNAL_H__
#include "../include/lustre_log.h"
#include <lustre_log.h>
struct llog_process_info {
struct llog_handle *lpi_loghandle;
......
......@@ -32,8 +32,8 @@
#define DEBUG_SUBSYSTEM S_LOG
#include "../include/obd_class.h"
#include "../include/lustre_log.h"
#include <obd_class.h>
#include <lustre_log.h>
#include "llog_internal.h"
/* helper functions for calling the llog obd methods */
......
......@@ -38,8 +38,8 @@
#define DEBUG_SUBSYSTEM S_LOG
#include "../include/llog_swab.h"
#include "../include/lustre_log.h"
#include <llog_swab.h>
#include <lustre_log.h>
static void print_llogd_body(struct llogd_body *d)
{
......
......@@ -38,8 +38,8 @@
*/
#include <linux/module.h>
#include "../include/lprocfs_status.h"
#include "../include/obd_support.h"
#include <lprocfs_status.h>
#include <obd_support.h>
void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount)
{
......
......@@ -36,9 +36,9 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_class.h"
#include "../include/lprocfs_status.h"
#include "../../include/uapi/linux/lustre/lustre_idl.h"
#include <obd_class.h>
#include <lprocfs_status.h>
#include <uapi/linux/lustre/lustre_idl.h>
#include <linux/seq_file.h>
#include <linux/ctype.h>
......
......@@ -40,19 +40,19 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/libcfs/libcfs.h>
# include <linux/module.h>
#include <linux/module.h>
/* hash_long() */
#include "../../include/linux/libcfs/libcfs_hash.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_disk.h"
#include "../include/lustre_fid.h"
#include "../include/lu_object.h"
#include "../include/cl_object.h"
#include "../include/lu_ref.h"
#include <linux/libcfs/libcfs_hash.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_disk.h>
#include <lustre_fid.h>
#include <lu_object.h>
#include <cl_object.h>
#include <lu_ref.h>
#include <linux/list.h>
enum {
......
......@@ -38,9 +38,9 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/libcfs/libcfs.h>
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lu_ref.h"
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lu_ref.h>
......@@ -36,9 +36,9 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_support.h"
#include "../include/lustre_handles.h"
#include "../include/lustre_lib.h"
#include <obd_support.h>
#include <lustre_handles.h>
#include <lustre_lib.h>
static __u64 handle_base;
#define HANDLE_INCR 7
......
......@@ -32,13 +32,13 @@
#define DEBUG_SUBSYSTEM S_RPC
#include "../include/obd.h"
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_lib.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_net.h"
#include "../include/lprocfs_status.h"
#include <obd.h>
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_lib.h>
#include <lustre_ha.h>
#include <lustre_net.h>
#include <lprocfs_status.h>
#define NIDS_MAX 32
......
......@@ -38,12 +38,12 @@
#include <linux/string.h>
#include "../../include/uapi/linux/lustre/lustre_ioctl.h"
#include "../include/llog_swab.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_log.h"
#include "../../include/uapi/linux/lustre/lustre_param.h"
#include "../include/obd_class.h"
#include <uapi/linux/lustre/lustre_ioctl.h>
#include <llog_swab.h>
#include <lprocfs_status.h>
#include <lustre_log.h>
#include <uapi/linux/lustre/lustre_param.h>
#include <obd_class.h>
#include "llog_internal.h"
......
......@@ -40,13 +40,13 @@
#define D_MOUNT (D_SUPER | D_CONFIG/*|D_WARNING */)
#define PRINT_CMD CDEBUG
#include "../include/obd.h"
#include "../include/lustre_compat.h"
#include "../include/obd_class.h"
#include "../../include/uapi/linux/lustre/lustre_idl.h"
#include "../include/lustre_log.h"
#include "../include/lustre_disk.h"
#include "../../include/uapi/linux/lustre/lustre_param.h"
#include <obd.h>
#include <lustre_compat.h>
#include <obd_class.h>
#include <uapi/linux/lustre/lustre_idl.h>
#include <lustre_log.h>
#include <lustre_disk.h>
#include <uapi/linux/lustre/lustre_param.h>
static int (*client_fill_super)(struct super_block *sb,
struct vfsmount *mnt);
......
......@@ -38,9 +38,9 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../include/obd_class.h"
#include "../../include/uapi/linux/lustre/lustre_idl.h"
#include "../include/lustre_obdo.h"
#include <obd_class.h>
#include <uapi/linux/lustre/lustre_idl.h>
#include <lustre_obdo.h>
void obdo_set_parent_fid(struct obdo *dst, const struct lu_fid *parent)
{
......
......@@ -37,10 +37,10 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include <linux/statfs.h>
#include "../include/lustre_export.h"
#include "../include/lustre_net.h"
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include <lustre_export.h>
#include <lustre_net.h>
#include <obd_support.h>
#include <obd_class.h>
void statfs_unpack(struct kstatfs *sfs, struct obd_statfs *osfs)
{
......
......@@ -34,10 +34,10 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/libcfs/libcfs.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include <obd_support.h>
#include <obd_class.h>
void class_uuid_unparse(class_uuid_t uu, struct obd_uuid *out)
{
......
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