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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/cl_object.h b/drivers/staging/lustre/lustre/include/cl_object.h
index c809239c08663d408924cb7c8757e704afdb254a..e51cd690f90789f3aba7615192da3d0246da03a1 100644 (file)
--- a/drivers/staging/lustre/lustre/include/cl_object.h
+++ b/drivers/staging/lustre/lustre/include/cl_object.h
@@ -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;
 

diff --git a/drivers/staging/lustre/lustre/include/dt_object.h b/drivers/staging/lustre/lustre/include/dt_object.h
index 7c6bbab50f8a0c825a8f991e76367fa1cea1a832..901f7f5348c53c0ff96f01ce2bb8da3b5be2228e 100644 (file)
--- a/drivers/staging/lustre/lustre/include/dt_object.h
+++ b/drivers/staging/lustre/lustre/include/dt_object.h
@@ -53,7 +53,7 @@
 /*
  * super-class definitions.
  */
-#include <lu_object.h>
+#include "lu_object.h"
 
 #include "../../include/linux/libcfs/libcfs.h"
 

diff --git a/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h b/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h
index d1e1a185ae1c8cf1d68b8cc00b832f433a32e159..cb76b5d6f71a98c51502301eb6138c8b35cc404f 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/linux/lprocfs_status.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>
 
 

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_acl.h b/drivers/staging/lustre/lustre/include/linux/lustre_acl.h
index a91c5497d22cc94822311c62061ded959704a635..b17273d403bb078596e5e7f5dfd798dc4d0f524f 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_acl.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_acl.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

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index d9d7ebb5683f1b845d60593f3348769669fdc581..8621bac5058bc6e6b2ac8f9288c3d046e062e238 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -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)

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h b/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
index 4da6e372e00bee98532e62480ff291027b1c69ec..75cc32c02eb56f5eecef2150cdb31d2ee9d44992 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
@@ -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);

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_lib.h b/drivers/staging/lustre/lustre/include/linux/lustre_lib.h
index 57f3b01d1a32670828bb0c4e28d218edb0c637dd..0a4c65ae92424ac7073351387e0c955f0dd76fe9 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_lib.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_lib.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_lite.h b/drivers/staging/lustre/lustre/include/linux/lustre_lite.h
index df93912756174cbe33053bb602d266911b3adb76..bd055ecac8bbdfa962668a3e4994bce4d5f22a03 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_lite.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_lite.h
@@ -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>

diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs.h b/drivers/staging/lustre/lustre/include/linux/lvfs.h
index e61f1b87f822c29825fff5190b1fb5be87838858..dd1be9c3982904dd46d5887d366b27f1f78d2dcb 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lvfs.h
+++ b/drivers/staging/lustre/lustre/include/linux/lvfs.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
 

diff --git a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
index 140a60f1f0c92036151296631cf1338ba5b0ffc6..0dea1789321d1b784471a1641d2e888442441c58 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
+++ b/drivers/staging/lustre/lustre/include/linux/lvfs_linux.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/linux/obd.h b/drivers/staging/lustre/lustre/include/linux/obd.h
index f96f65d5168fbd480fa5abdd0b056c1149caafd6..2a3a88cbb192f0ebc5e933971db60d8f6083265b 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/obd.h
+++ b/drivers/staging/lustre/lustre/include/linux/obd.h
@@ -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;

diff --git a/drivers/staging/lustre/lustre/include/linux/obd_support.h b/drivers/staging/lustre/lustre/include/linux/obd_support.h
index db7a8bacd491c02d4d1ab86eafec7f66d8d43226..ea03b8434f624b2f29020f15df1e3849f1ad5b0c 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/linux/obd_support.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index 2f86eb7976eb2a0e567e5ca505153921b588036d..d8d6728738e714c21a26df7224f23672f1dc226a 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -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 {

diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h
index 4fe1611ff703d0ec7dcba13cc3b06b20ed922133..d5c368bab5bdaa9706a72a0752aeb2147fafbc7a 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -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;

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 3d5bec75564c042be3a7237bed81a74f0ead8807..6f7af96b5098f65700b673fe20d16ddc0b75d485 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 95c754f2075f4f211d23a70ead54c8068aa70717..9bbd9042d6646fe2182e94a257c6d10b18b0b30a 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/lustre_capa.h b/drivers/staging/lustre/lustre/include/lustre_capa.h
index d77bffc0b59d5215600f13707e77ddaf3a3c62a9..4bafba98f050d44a8882d124f68e6092231a97b5 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_capa.h
+++ b/drivers/staging/lustre/lustre/include/lustre_capa.h
@@ -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 */

diff --git a/drivers/staging/lustre/lustre/include/lustre_cfg.h b/drivers/staging/lustre/lustre/include/lustre_cfg.h
index 3680668a892049b4f75636cdbf4a421ca22bf624..03017fe49d46748c5d84ab378508575ff0224c89 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_cfg.h
+++ b/drivers/staging/lustre/lustre/include/lustre_cfg.h
@@ -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 */
 

diff --git a/drivers/staging/lustre/lustre/include/lustre_debug.h b/drivers/staging/lustre/lustre/include/lustre_debug.h
index 6146ccb8cce0042fa5eea48bed71b8dbe3f7dd18..6c92d0bc943b2a4545c15b2b495d30fe052581f6 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_debug.h
+++ b/drivers/staging/lustre/lustre/include/lustre_debug.h
@@ -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);

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index bf5b2cb792e3e1070c927b10cb2ae4a5317195be..bdf897b8383e9b109aac4defe61ebbb4602a8447 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -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"
 

diff --git a/drivers/staging/lustre/lustre/include/lustre_export.h b/drivers/staging/lustre/lustre/include/lustre_export.h
index 103f7a8bd83fc3d1b2939117bfaba7526b2e8e72..bbb4b97034ac35f9086f558cd244a44131e85c92 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_export.h
+++ b/drivers/staging/lustre/lustre/include/lustre_export.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;

diff --git a/drivers/staging/lustre/lustre/include/lustre_fid.h b/drivers/staging/lustre/lustre/include/lustre_fid.h
index 5b73330928051fc2913309660ced3148fa78abd6..7fa557bc80e668beef022b1cbd5083874927a619 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_fid.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fid.h
@@ -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;

diff --git a/drivers/staging/lustre/lustre/include/lustre_fld.h b/drivers/staging/lustre/lustre/include/lustre_fld.h
index 365854789f601083ff90aede1df59d292e79a76c..ce6330f9bb50a2812f4d32408bbbd348c189e8cf 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_fld.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fld.h
@@ -42,7 +42,7 @@
  * @{
  */
 
-#include <lustre/lustre_idl.h>
+#include "lustre/lustre_idl.h"
 #include "../../include/linux/libcfs/libcfs.h"
 
 struct lu_client_fld;

diff --git a/drivers/staging/lustre/lustre/include/lustre_handles.h b/drivers/staging/lustre/lustre/include/lustre_handles.h
index 8ae868fdf658265953093a297a8b42c5034ddce6..94989c5e361fa8f97a27dfcd2490190719e6295b 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_handles.h
+++ b/drivers/staging/lustre/lustre/include/lustre_handles.h
@@ -42,7 +42,7 @@
  * @{
  */
 
-#include <linux/lustre_handles.h>
+#include "linux/lustre_handles.h"
 
 #include "../../include/linux/libcfs/libcfs.h"
 

diff --git a/drivers/staging/lustre/lustre/include/lustre_import.h b/drivers/staging/lustre/lustre/include/lustre_import.h
index 01ed786b40b95a503c0d0de0d65adea4469739a1..51db5eb06d9969fce00fa94da24f6e38ba8062b4 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_import.h
+++ b/drivers/staging/lustre/lustre/include/lustre_import.h
@@ -47,8 +47,8 @@
  * @{
  */
 
-#include <lustre_handles.h>
-#include <lustre/lustre_idl.h>
+#include "lustre_handles.h"
+#include "lustre/lustre_idl.h"
 
 
 /**

diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h
index 60edf5a59918174679563b68318808b0d6b59a70..8aecb9a3c84dcb2165c5c3e8c51760e26621bc36 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_lib.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lib.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);

diff --git a/drivers/staging/lustre/lustre/include/lustre_lite.h b/drivers/staging/lustre/lustre/include/lustre_lite.h
index beccb5e4065ffbd795ce27bcfb1e9b7c34726e3c..eee900638720630c0745ed405e7096c5d94fbfb1 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_lite.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lite.h
@@ -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 {

diff --git a/drivers/staging/lustre/lustre/include/lustre_log.h b/drivers/staging/lustre/lustre/include/lustre_log.h
index 1a9a9228b795efea1f5bc8ff2307c71aa2c6d247..d02ea24a7e404e585b715f99504b3f0e5895645a 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_log.h
+++ b/drivers/staging/lustre/lustre/include/lustre_log.h
@@ -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)

diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h
index 1efcf838b197e10a201da70485267efd5c1f2934..39bbc3634b0659a49906bb144e130a36e8bbcd07 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h
@@ -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;

diff --git a/drivers/staging/lustre/lustre/include/lustre_mds.h b/drivers/staging/lustre/lustre/include/lustre_mds.h
index 9a1575013178595d7d81c88a83f6983fecf4fef0..f0cce41c55c09409e1792d83374de91844545276 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_mds.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mds.h
@@ -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;

diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index fd8d943c2848e2684d1a004e9f8f5caa73cdac33..3d3346105fed236a6f71e31010445f3b8991e80e 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -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

diff --git a/drivers/staging/lustre/lustre/include/lustre_quota.h b/drivers/staging/lustre/lustre/include/lustre_quota.h
index 07cb7c310bcc1228e59a070d883d61c0231b5b0c..1ae72e3ff1bf7fb0c9089e76d041ee8f4bc53248 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_quota.h
+++ b/drivers/staging/lustre/lustre/include/lustre_quota.h
@@ -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 */

diff --git a/drivers/staging/lustre/lustre/include/lustre_req_layout.h b/drivers/staging/lustre/lustre/include/lustre_req_layout.h
index a83db61a30beefc39e48124821e11113e2a0aadb..c6457b27c4e757c7089aa4cb08b4023df470e47f 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_req_layout.h
+++ b/drivers/staging/lustre/lustre/include/lustre_req_layout.h
@@ -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);

diff --git a/drivers/staging/lustre/lustre/include/lvfs.h b/drivers/staging/lustre/lustre/include/lvfs.h
index 156481c2a9111268cc0d512ea49b498e51d610a1..32dcd57c47cc875adaf06cdba42992d31eab47d2 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lvfs.h
+++ b/drivers/staging/lustre/lustre/include/lvfs.h
@@ -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"
 

diff --git a/drivers/staging/lustre/lustre/include/md_object.h b/drivers/staging/lustre/lustre/include/md_object.h
index ef46b2c461a68e5d78e951c60dab9e3002067cb1..2e5d55030a631734234a8fcf637588cdcf2d9d04 100644 (file)
--- a/drivers/staging/lustre/lustre/include/md_object.h
+++ b/drivers/staging/lustre/lustre/include/md_object.h
@@ -56,7 +56,7 @@
 /*
  * super-class definitions.
  */
-#include <dt_object.h>
+#include "dt_object.h"
 
 struct md_device;
 struct md_device_operations;

diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index e2f33d14e0e46b3efe5221432a4a67a7fcfa318b..6f036ce7e2da52825606cb8d31198b110bf6e32f 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -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
 

diff --git a/drivers/staging/lustre/lustre/include/obd_cksum.h b/drivers/staging/lustre/lustre/include/obd_cksum.h
index d2e0d4c45e6b250818ae4020d316b179485a91c7..662a78062963538a0f4759e4be511f8581fc57cd 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_cksum.h
+++ b/drivers/staging/lustre/lustre/include/obd_cksum.h
@@ -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)
 {

diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h
index f8a9d7c91e818092a3d8cc1785816ff227ea23ab..040fc156b9257e1ddd590b7373a7d57dedd8b93e 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_class.h
+++ b/drivers/staging/lustre/lustre/include/obd_class.h
@@ -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 */

diff --git a/drivers/staging/lustre/lustre/include/obd_ost.h b/drivers/staging/lustre/lustre/include/obd_ost.h
index 54ef540451150b97e2792016b6fd89f949d7fec4..60de42972ec9e13fa355d41989676c6af962f768 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_ost.h
+++ b/drivers/staging/lustre/lustre/include/obd_ost.h
@@ -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;

diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index f9a120318963e9083fb5c6edd065aa6b5e0a5c57..4164caea8e7df0740d9d1edbf72ba81b53a67f85 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -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;