Commit 67a235f5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: lustre: llite: remove ccflags from Makefile

Fix up the relative paths in the .c files to properly build with the
Makefile change.

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 0e9ad0ef
......@@ -51,8 +51,8 @@
#include "../lustre_ha.h"
#include <linux/rbtree.h>
#include <linux/lustre_compat25.h>
#include <linux/lustre_common.h>
#include "../../include/linux/lustre_compat25.h"
#include "../../include/linux/lustre_common.h"
#include <linux/pagemap.h>
/* lprocfs.c */
......
......@@ -41,19 +41,19 @@
*/
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_class.h>
#include <obd_support.h>
#include <obd.h>
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/obd.h"
# include <lustre_dlm.h>
# include <lustre_lite.h>
# include <lustre_mdc.h>
# include <linux/pagemap.h>
# include <linux/file.h>
#include "../include/lustre_dlm.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_mdc.h"
#include <linux/pagemap.h>
#include <linux/file.h>
#include "cl_object.h"
#include "lclient.h"
# include "../llite/llite_internal.h"
#include "../include/cl_object.h"
#include "../include/lclient.h"
#include "../llite/llite_internal.h"
static const struct cl_lock_descr whole_file = {
.cld_start = 0,
......
......@@ -50,16 +50,16 @@
# include <linux/pagemap.h>
# include <linux/rbtree.h>
#include <obd.h>
#include <obd_support.h>
#include <lustre_fid.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_ver.h>
#include <lustre_mdc.h>
#include <cl_object.h>
#include <lclient.h>
#include "../include/obd.h"
#include "../include/obd_support.h"
#include "../include/lustre_fid.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_ver.h"
#include "../include/lustre_mdc.h"
#include "../include/cl_object.h"
#include "../include/lclient.h"
#include "../llite/llite_internal.h"
......
......@@ -37,13 +37,13 @@
* future).
*
*/
#include <obd_class.h>
#include <obd_support.h>
#include <obd.h>
#include <cl_object.h>
#include <lclient.h>
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/obd.h"
#include "../include/cl_object.h"
#include "../include/lclient.h"
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
/* Initialize the default and maximum LOV EA and cookie sizes. This allows
......
......@@ -9,6 +9,3 @@ lustre-y := dcache.o dir.o file.o llite_close.o llite_lib.o llite_nfs.o \
lustre-$(CONFIG_PROC_FS) += lproc_llite.o
llite_lloop-y := lloop.o
ccflags-y := -I$(src)/../include
......@@ -40,10 +40,10 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_support.h>
#include <lustre_lite.h>
#include <lustre/lustre_idl.h>
#include <lustre_dlm.h>
#include "../include/obd_support.h"
#include "../include/lustre_lite.h"
#include "../include/lustre/lustre_idl.h"
#include "../include/lustre_dlm.h"
#include "llite_internal.h"
......
......@@ -48,13 +48,13 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_lib.h>
#include <lustre/lustre_idl.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_fid.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_lib.h"
#include "../include/lustre/lustre_idl.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_fid.h"
#include "llite_internal.h"
/*
......
......@@ -41,14 +41,14 @@
*/
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_dlm.h>
#include <lustre_lite.h>
#include "../include/lustre_dlm.h"
#include "../include/lustre_lite.h"
#include <linux/pagemap.h>
#include <linux/file.h>
#include "llite_internal.h"
#include <lustre/ll_fiemap.h>
#include "../include/lustre/ll_fiemap.h"
#include "cl_object.h"
#include "../include/cl_object.h"
static int
ll_put_grouplock(struct inode *inode, struct file *file, unsigned long arg);
......
......@@ -45,7 +45,7 @@
#include <linux/file.h>
#include <linux/kmod.h>
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
#include "llite_internal.h"
/* for obd_capa.c_list, client capa might stay in three places:
......
......@@ -42,7 +42,7 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
#include "llite_internal.h"
/** records that a write is in flight */
......
......@@ -36,16 +36,16 @@
#ifndef LLITE_INTERNAL_H
#define LLITE_INTERNAL_H
#include <lustre_debug.h>
#include <lustre_ver.h>
#include <lustre_disk.h> /* for s2sbi */
#include <lustre_eacl.h>
#include "../include/lustre_debug.h"
#include "../include/lustre_ver.h"
#include "../include/lustre_disk.h" /* for s2sbi */
#include "../include/lustre_eacl.h"
/* for struct cl_lock_descr and struct cl_io */
#include <cl_object.h>
#include <lclient.h>
#include <lustre_mdc.h>
#include <linux/lustre_intent.h>
#include "../include/cl_object.h"
#include "../include/lclient.h"
#include "../include/lustre_mdc.h"
#include "../include/linux/lustre_intent.h"
#include <linux/compat.h>
#include <linux/posix_acl_xattr.h>
......
......@@ -44,15 +44,15 @@
#include <linux/types.h>
#include <linux/mm.h>
#include <lustre_lite.h>
#include <lustre_ha.h>
#include <lustre_dlm.h>
#include <lprocfs_status.h>
#include <lustre_disk.h>
#include <lustre_param.h>
#include <lustre_log.h>
#include <cl_object.h>
#include <obd_cksum.h>
#include "../include/lustre_lite.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_dlm.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_disk.h"
#include "../include/lustre_param.h"
#include "../include/lustre_log.h"
#include "../include/cl_object.h"
#include "../include/obd_cksum.h"
#include "llite_internal.h"
struct kmem_cache *ll_file_data_slab;
......
......@@ -47,9 +47,9 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
#include "llite_internal.h"
#include <linux/lustre_compat25.h>
#include "../include/linux/lustre_compat25.h"
static const struct vm_operations_struct ll_file_vm_ops;
......
......@@ -42,7 +42,7 @@
*/
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
#include "llite_internal.h"
#include <linux/exportfs.h>
......
......@@ -44,8 +44,8 @@
#ifdef CONFIG_FS_POSIX_ACL
#include <lustre_lite.h>
#include <lustre_eacl.h>
#include "../include/lustre_lite.h"
#include "../include/lustre_eacl.h"
#include "llite_internal.h"
static inline __u32 rce_hashfunc(uid_t id)
......
......@@ -103,8 +103,8 @@
#include <asm/uaccess.h>
#include <lustre_lib.h>
#include <lustre_lite.h>
#include "../include/lustre_lib.h"
#include "../include/lustre_lite.h"
#include "llite_internal.h"
#define LLOOP_MAX_SEGMENTS LNET_MAX_IOV
......
......@@ -35,10 +35,10 @@
*/
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include <lprocfs_status.h>
#include "../include/lustre_lite.h"
#include "../include/lprocfs_status.h"
#include <linux/seq_file.h>
#include <obd_support.h>
#include "../include/obd_support.h"
#include "llite_internal.h"
#include "vvp_internal.h"
......
......@@ -44,11 +44,11 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_support.h>
#include <lustre_fid.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_ver.h>
#include "../include/obd_support.h"
#include "../include/lustre_fid.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_ver.h"
#include "llite_internal.h"
static int ll_create_it(struct inode *, struct dentry *,
......
......@@ -46,12 +46,12 @@
#include <linux/module.h>
#include <linux/types.h>
#include <lustre_lite.h>
#include <lustre_ha.h>
#include <lustre_dlm.h>
#include <lprocfs_status.h>
#include <lustre_disk.h>
#include <lustre_param.h>
#include "../include/lustre_lite.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_dlm.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre_disk.h"
#include "../include/lustre_param.h"
#include "llite_internal.h"
struct kmem_cache *ll_remote_perm_cachep = NULL;
......
......@@ -54,10 +54,10 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include <obd_cksum.h>
#include "../include/lustre_lite.h"
#include "../include/obd_cksum.h"
#include "llite_internal.h"
#include <linux/lustre_compat25.h>
#include "../include/linux/lustre_compat25.h"
/**
* Finalizes cl-data before exiting typical address_space operation. Dual to
......
......@@ -55,9 +55,9 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
#include "llite_internal.h"
#include <linux/lustre_compat25.h>
#include "../include/linux/lustre_compat25.h"
/**
* Implements Linux VM address_space::invalidatepage() method. This method is
......
......@@ -42,9 +42,9 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_support.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include "../include/obd_support.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_dlm.h"
#include "llite_internal.h"
#define SA_OMITTED_ENTRY_MAX 8ULL
......
......@@ -38,12 +38,12 @@
#include <linux/module.h>
#include <linux/types.h>
#include <lustre_lite.h>
#include <lustre_ha.h>
#include <lustre_dlm.h>
#include "../include/lustre_lite.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_dlm.h"
#include <linux/init.h>
#include <linux/fs.h>
#include <lprocfs_status.h>
#include "../include/lprocfs_status.h"
#include "llite_internal.h"
static struct kmem_cache *ll_inode_cachep;
......
......@@ -39,7 +39,7 @@
#include <linux/stat.h>
#define DEBUG_SUBSYSTEM S_LLITE
#include <lustre_lite.h>
#include "../include/lustre_lite.h"
#include "llite_internal.h"
static int ll_readlink_internal(struct inode *inode,
......
......@@ -41,8 +41,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd.h>
#include <lustre_lite.h>
#include "../include/obd.h"
#include "../include/lustre_lite.h"
#include "llite_internal.h"
#include "vvp_internal.h"
......
......@@ -40,7 +40,7 @@
#define VVP_INTERNAL_H
#include <cl_object.h>
#include "../include/cl_object.h"
#include "llite_internal.h"
int vvp_io_init (const struct lu_env *env,
......
......@@ -42,8 +42,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd.h>
#include <lustre_lite.h>
#include "../include/obd.h"
#include "../include/lustre_lite.h"
#include "vvp_internal.h"
......
......@@ -39,8 +39,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd.h>
#include <lustre_lite.h>
#include "../include/obd.h"
#include "../include/lustre_lite.h"
#include "vvp_internal.h"
......
......@@ -43,8 +43,8 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <obd.h>
#include <lustre_lite.h>
#include "../include/obd.h"
#include "../include/lustre_lite.h"
#include "vvp_internal.h"
......
......@@ -42,8 +42,8 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd.h>
#include <lustre_lite.h>
#include "../include/obd.h"
#include "../include/lustre_lite.h"
#include "vvp_internal.h"
......
......@@ -41,11 +41,11 @@
#define DEBUG_SUBSYSTEM S_LLITE
#include <obd_support.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_ver.h>
#include <lustre_eacl.h>
#include "../include/obd_support.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_ver.h"
#include "../include/lustre_eacl.h"
#include "llite_internal.h"
......
......@@ -10,10 +10,10 @@
#include <linux/fs.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <obd_support.h>
#include <lustre_lite.h>
#include <lustre_dlm.h>
#include <lustre_ver.h>
#include "../include/obd_support.h"
#include "../include/lustre_lite.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_ver.h"
#include "llite_internal.h"
/* If we ever have hundreds of extended attributes, we might want to consider
......
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