From 67a235f5e5893bc7dc86cf0e867fdb3f9041df18 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 21:51:41 -0700 Subject: [PATCH] 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 Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- .../lustre/lustre/include/linux/lustre_lite.h | 4 ++-- .../staging/lustre/lustre/lclient/glimpse.c | 22 +++++++++---------- .../lustre/lustre/lclient/lcommon_cl.c | 20 ++++++++--------- .../lustre/lustre/lclient/lcommon_misc.c | 12 +++++----- drivers/staging/lustre/lustre/llite/Makefile | 3 --- drivers/staging/lustre/lustre/llite/dcache.c | 8 +++---- drivers/staging/lustre/lustre/llite/dir.c | 14 ++++++------ drivers/staging/lustre/lustre/llite/file.c | 8 +++---- .../staging/lustre/lustre/llite/llite_capa.c | 2 +- .../staging/lustre/lustre/llite/llite_close.c | 2 +- .../lustre/lustre/llite/llite_internal.h | 16 +++++++------- .../staging/lustre/lustre/llite/llite_lib.c | 18 +++++++-------- .../staging/lustre/lustre/llite/llite_mmap.c | 4 ++-- .../staging/lustre/lustre/llite/llite_nfs.c | 2 +- .../lustre/lustre/llite/llite_rmtacl.c | 4 ++-- drivers/staging/lustre/lustre/llite/lloop.c | 4 ++-- .../staging/lustre/lustre/llite/lproc_llite.c | 6 ++--- drivers/staging/lustre/lustre/llite/namei.c | 10 ++++----- .../staging/lustre/lustre/llite/remote_perm.c | 12 +++++----- drivers/staging/lustre/lustre/llite/rw.c | 6 ++--- drivers/staging/lustre/lustre/llite/rw26.c | 4 ++-- .../staging/lustre/lustre/llite/statahead.c | 6 ++--- drivers/staging/lustre/lustre/llite/super25.c | 8 +++---- drivers/staging/lustre/lustre/llite/symlink.c | 2 +- drivers/staging/lustre/lustre/llite/vvp_dev.c | 4 ++-- .../lustre/lustre/llite/vvp_internal.h | 2 +- drivers/staging/lustre/lustre/llite/vvp_io.c | 4 ++-- .../staging/lustre/lustre/llite/vvp_lock.c | 4 ++-- .../staging/lustre/lustre/llite/vvp_object.c | 4 ++-- .../staging/lustre/lustre/llite/vvp_page.c | 4 ++-- drivers/staging/lustre/lustre/llite/xattr.c | 10 ++++----- .../staging/lustre/lustre/llite/xattr_cache.c | 8 +++---- 32 files changed, 117 insertions(+), 120 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_lite.h b/drivers/staging/lustre/lustre/include/linux/lustre_lite.h index bd055ecac8bb..99eed4987635 100644 --- a/drivers/staging/lustre/lustre/include/linux/lustre_lite.h +++ b/drivers/staging/lustre/lustre/include/linux/lustre_lite.h @@ -51,8 +51,8 @@ #include "../lustre_ha.h" #include -#include -#include +#include "../../include/linux/lustre_compat25.h" +#include "../../include/linux/lustre_common.h" #include /* lprocfs.c */ diff --git a/drivers/staging/lustre/lustre/lclient/glimpse.c b/drivers/staging/lustre/lustre/lclient/glimpse.c index 8dd4b22eff31..b9f2bb66de21 100644 --- a/drivers/staging/lustre/lustre/lclient/glimpse.c +++ b/drivers/staging/lustre/lustre/lclient/glimpse.c @@ -41,19 +41,19 @@ */ #include "../../include/linux/libcfs/libcfs.h" -#include -#include -#include +#include "../include/obd_class.h" +#include "../include/obd_support.h" +#include "../include/obd.h" -# include -# include -# include -# include -# include +#include "../include/lustre_dlm.h" +#include "../include/lustre_lite.h" +#include "../include/lustre_mdc.h" +#include +#include -#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, diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c index 7791d3d3bca4..0587c67cd129 100644 --- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c +++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c @@ -50,16 +50,16 @@ # include # include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#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" diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_misc.c b/drivers/staging/lustre/lustre/lclient/lcommon_misc.c index 367bdadee162..ec9ddc82ddb9 100644 --- a/drivers/staging/lustre/lustre/lclient/lcommon_misc.c +++ b/drivers/staging/lustre/lustre/lclient/lcommon_misc.c @@ -37,13 +37,13 @@ * future). * */ -#include -#include -#include -#include -#include +#include "../include/obd_class.h" +#include "../include/obd_support.h" +#include "../include/obd.h" +#include "../include/cl_object.h" +#include "../include/lclient.h" -#include +#include "../include/lustre_lite.h" /* Initialize the default and maximum LOV EA and cookie sizes. This allows diff --git a/drivers/staging/lustre/lustre/llite/Makefile b/drivers/staging/lustre/lustre/llite/Makefile index c76f3cfedab0..7d70115d5bc7 100644 --- a/drivers/staging/lustre/lustre/llite/Makefile +++ b/drivers/staging/lustre/lustre/llite/Makefile @@ -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 diff --git a/drivers/staging/lustre/lustre/llite/dcache.c b/drivers/staging/lustre/lustre/llite/dcache.c index 7d520d8f4a69..48b1402d6cf2 100644 --- a/drivers/staging/lustre/lustre/llite/dcache.c +++ b/drivers/staging/lustre/lustre/llite/dcache.c @@ -40,10 +40,10 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include -#include -#include +#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" diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c index 6efaf03196d5..4d28a857dc8f 100644 --- a/drivers/staging/lustre/lustre/llite/dir.c +++ b/drivers/staging/lustre/lustre/llite/dir.c @@ -48,13 +48,13 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include -#include -#include -#include -#include -#include +#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" /* diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index 660fd4d755eb..e7a8bc1de354 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -41,14 +41,14 @@ */ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/lustre_dlm.h" +#include "../include/lustre_lite.h" #include #include #include "llite_internal.h" -#include +#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); diff --git a/drivers/staging/lustre/lustre/llite/llite_capa.c b/drivers/staging/lustre/lustre/llite/llite_capa.c index 2f11cbf5639c..051b023281e1 100644 --- a/drivers/staging/lustre/lustre/llite/llite_capa.c +++ b/drivers/staging/lustre/lustre/llite/llite_capa.c @@ -45,7 +45,7 @@ #include #include -#include +#include "../include/lustre_lite.h" #include "llite_internal.h" /* for obd_capa.c_list, client capa might stay in three places: diff --git a/drivers/staging/lustre/lustre/llite/llite_close.c b/drivers/staging/lustre/lustre/llite/llite_close.c index 38c2d0e947db..9a5e255dab76 100644 --- a/drivers/staging/lustre/lustre/llite/llite_close.c +++ b/drivers/staging/lustre/lustre/llite/llite_close.c @@ -42,7 +42,7 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include +#include "../include/lustre_lite.h" #include "llite_internal.h" /** records that a write is in flight */ diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h index 140ee947ba49..1d11d0156791 100644 --- a/drivers/staging/lustre/lustre/llite/llite_internal.h +++ b/drivers/staging/lustre/lustre/llite/llite_internal.h @@ -36,16 +36,16 @@ #ifndef LLITE_INTERNAL_H #define LLITE_INTERNAL_H -#include -#include -#include /* for s2sbi */ -#include +#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 -#include -#include -#include +#include "../include/cl_object.h" +#include "../include/lclient.h" +#include "../include/lustre_mdc.h" +#include "../include/linux/lustre_intent.h" #include #include diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 7eadd6007106..5e96e4239a03 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -44,15 +44,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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; diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c index 426c73961665..3af47b3dc79c 100644 --- a/drivers/staging/lustre/lustre/llite/llite_mmap.c +++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c @@ -47,9 +47,9 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include +#include "../include/lustre_lite.h" #include "llite_internal.h" -#include +#include "../include/linux/lustre_compat25.h" static const struct vm_operations_struct ll_file_vm_ops; diff --git a/drivers/staging/lustre/lustre/llite/llite_nfs.c b/drivers/staging/lustre/lustre/llite/llite_nfs.c index a614b913ddc2..8fdd6e093d1a 100644 --- a/drivers/staging/lustre/lustre/llite/llite_nfs.c +++ b/drivers/staging/lustre/lustre/llite/llite_nfs.c @@ -42,7 +42,7 @@ */ #define DEBUG_SUBSYSTEM S_LLITE -#include +#include "../include/lustre_lite.h" #include "llite_internal.h" #include diff --git a/drivers/staging/lustre/lustre/llite/llite_rmtacl.c b/drivers/staging/lustre/lustre/llite/llite_rmtacl.c index 4c610369cb9b..be0c3eff108c 100644 --- a/drivers/staging/lustre/lustre/llite/llite_rmtacl.c +++ b/drivers/staging/lustre/lustre/llite/llite_rmtacl.c @@ -44,8 +44,8 @@ #ifdef CONFIG_FS_POSIX_ACL -#include -#include +#include "../include/lustre_lite.h" +#include "../include/lustre_eacl.h" #include "llite_internal.h" static inline __u32 rce_hashfunc(uid_t id) diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c index 0ff8c3362a8d..808663898b73 100644 --- a/drivers/staging/lustre/lustre/llite/lloop.c +++ b/drivers/staging/lustre/lustre/llite/lloop.c @@ -103,8 +103,8 @@ #include -#include -#include +#include "../include/lustre_lib.h" +#include "../include/lustre_lite.h" #include "llite_internal.h" #define LLOOP_MAX_SEGMENTS LNET_MAX_IOV diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c index d9c874c95ac8..e952dfa9ed36 100644 --- a/drivers/staging/lustre/lustre/llite/lproc_llite.c +++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c @@ -35,10 +35,10 @@ */ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/lustre_lite.h" +#include "../include/lprocfs_status.h" #include -#include +#include "../include/obd_support.h" #include "llite_internal.h" #include "vvp_internal.h" diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c index dfa1e745dfd6..5168e0a6c879 100644 --- a/drivers/staging/lustre/lustre/llite/namei.c +++ b/drivers/staging/lustre/lustre/llite/namei.c @@ -44,11 +44,11 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include -#include -#include -#include +#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 *, diff --git a/drivers/staging/lustre/lustre/llite/remote_perm.c b/drivers/staging/lustre/lustre/llite/remote_perm.c index a8b1117b8f60..5d936caeba9c 100644 --- a/drivers/staging/lustre/lustre/llite/remote_perm.c +++ b/drivers/staging/lustre/lustre/llite/remote_perm.c @@ -46,12 +46,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#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; diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c index 56162103cc79..6028f1a984f0 100644 --- a/drivers/staging/lustre/lustre/llite/rw.c +++ b/drivers/staging/lustre/lustre/llite/rw.c @@ -54,10 +54,10 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/lustre_lite.h" +#include "../include/obd_cksum.h" #include "llite_internal.h" -#include +#include "../include/linux/lustre_compat25.h" /** * Finalizes cl-data before exiting typical address_space operation. Dual to diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c index af84c1aaa5f8..3f157e76a15c 100644 --- a/drivers/staging/lustre/lustre/llite/rw26.c +++ b/drivers/staging/lustre/lustre/llite/rw26.c @@ -55,9 +55,9 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include +#include "../include/lustre_lite.h" #include "llite_internal.h" -#include +#include "../include/linux/lustre_compat25.h" /** * Implements Linux VM address_space::invalidatepage() method. This method is diff --git a/drivers/staging/lustre/lustre/llite/statahead.c b/drivers/staging/lustre/lustre/llite/statahead.c index 1b47774d7447..31d92cbe520b 100644 --- a/drivers/staging/lustre/lustre/llite/statahead.c +++ b/drivers/staging/lustre/lustre/llite/statahead.c @@ -42,9 +42,9 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include -#include +#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 diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c index 951fdb1265b9..078c0e95f4cf 100644 --- a/drivers/staging/lustre/lustre/llite/super25.c +++ b/drivers/staging/lustre/lustre/llite/super25.c @@ -38,12 +38,12 @@ #include #include -#include -#include -#include +#include "../include/lustre_lite.h" +#include "../include/lustre_ha.h" +#include "../include/lustre_dlm.h" #include #include -#include +#include "../include/lprocfs_status.h" #include "llite_internal.h" static struct kmem_cache *ll_inode_cachep; diff --git a/drivers/staging/lustre/lustre/llite/symlink.c b/drivers/staging/lustre/lustre/llite/symlink.c index 129d3023dcea..20e678b31c7b 100644 --- a/drivers/staging/lustre/lustre/llite/symlink.c +++ b/drivers/staging/lustre/lustre/llite/symlink.c @@ -39,7 +39,7 @@ #include #define DEBUG_SUBSYSTEM S_LLITE -#include +#include "../include/lustre_lite.h" #include "llite_internal.h" static int ll_readlink_internal(struct inode *inode, diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c index 0f68c16abe30..0f2e79d6b7f8 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_dev.c +++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c @@ -41,8 +41,8 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/obd.h" +#include "../include/lustre_lite.h" #include "llite_internal.h" #include "vvp_internal.h" diff --git a/drivers/staging/lustre/lustre/llite/vvp_internal.h b/drivers/staging/lustre/lustre/llite/vvp_internal.h index 3c9a03d99559..2162bf6c08a7 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_internal.h +++ b/drivers/staging/lustre/lustre/llite/vvp_internal.h @@ -40,7 +40,7 @@ #define VVP_INTERNAL_H -#include +#include "../include/cl_object.h" #include "llite_internal.h" int vvp_io_init (const struct lu_env *env, diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c index 2539a89e4255..a4117d6a3866 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_io.c +++ b/drivers/staging/lustre/lustre/llite/vvp_io.c @@ -42,8 +42,8 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/obd.h" +#include "../include/lustre_lite.h" #include "vvp_internal.h" diff --git a/drivers/staging/lustre/lustre/llite/vvp_lock.c b/drivers/staging/lustre/lustre/llite/vvp_lock.c index e16b31e4ff72..372633e164b9 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_lock.c +++ b/drivers/staging/lustre/lustre/llite/vvp_lock.c @@ -39,8 +39,8 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/obd.h" +#include "../include/lustre_lite.h" #include "vvp_internal.h" diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c b/drivers/staging/lustre/lustre/llite/vvp_object.c index 369a3859bd0c..b6f6d4cb6e41 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_object.c +++ b/drivers/staging/lustre/lustre/llite/vvp_object.c @@ -43,8 +43,8 @@ #include "../../include/linux/libcfs/libcfs.h" -#include -#include +#include "../include/obd.h" +#include "../include/lustre_lite.h" #include "vvp_internal.h" diff --git a/drivers/staging/lustre/lustre/llite/vvp_page.c b/drivers/staging/lustre/lustre/llite/vvp_page.c index 1c02c128e0ee..4626346f6ee1 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_page.c +++ b/drivers/staging/lustre/lustre/llite/vvp_page.c @@ -42,8 +42,8 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include +#include "../include/obd.h" +#include "../include/lustre_lite.h" #include "vvp_internal.h" diff --git a/drivers/staging/lustre/lustre/llite/xattr.c b/drivers/staging/lustre/lustre/llite/xattr.c index c1eff650aa82..665ca572027f 100644 --- a/drivers/staging/lustre/lustre/llite/xattr.c +++ b/drivers/staging/lustre/lustre/llite/xattr.c @@ -41,11 +41,11 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include -#include -#include -#include -#include +#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" diff --git a/drivers/staging/lustre/lustre/llite/xattr_cache.c b/drivers/staging/lustre/lustre/llite/xattr_cache.c index 4dd83fc03687..edec945d2eb3 100644 --- a/drivers/staging/lustre/lustre/llite/xattr_cache.c +++ b/drivers/staging/lustre/lustre/llite/xattr_cache.c @@ -10,10 +10,10 @@ #include #include #include -#include -#include -#include -#include +#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 -- 2.34.1