leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: lustre: ptlrpc/ldlm: remove ccflags from Makefile

Browse Source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-07-11 22:29:36 -07:00
parent 7f2d973a7c
commit e27db14919
40 changed files with 177 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/lustre/lustre/ldlm/interval_tree.c
View File

@ -38,9 +38,9 @@
* Author: Huang Wei <huangwei@clusterfs.com>
* Author: Jay Xiong <jinshan.xiong@sun.com>
*/
# include <lustre_dlm.h>
#include <obd_support.h>
#include <interval_tree.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_support.h"
#include "../include/interval_tree.h"
enum {
INTERVAL_RED = 0,

4
drivers/staging/lustre/lustre/ldlm/l_lock.c
View File

@ -37,8 +37,8 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre_dlm.h>
#include <lustre_lib.h>
#include "../include/lustre_dlm.h"
#include "../include/lustre_lib.h"
/**
* Lock a lock and its resource.

12
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
View File

@ -51,13 +51,11 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre_dlm.h>
#include <obd_support.h>
#include <obd.h>
#include <obd_class.h>
#include <lustre_lib.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_support.h"
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/lustre_lib.h"
#include "ldlm_internal.h"

9
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
View File

@ -56,12 +56,11 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include <lustre_dlm.h>
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_lib.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_lib.h"
#include <linux/list.h>
#include "ldlm_internal.h"
int ldlm_flock_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,

7
drivers/staging/lustre/lustre/ldlm/ldlm_inodebits.c
View File

@ -53,10 +53,9 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include <lustre_dlm.h>
#include <obd_support.h>
#include <lustre_lib.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_support.h"
#include "../include/lustre_lib.h"
#include "ldlm_internal.h"

10
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
View File

@ -44,11 +44,11 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include "../../include/linux/libcfs/libcfs.h"
#include <obd.h>
#include <obd_class.h>
#include <lustre_dlm.h>
#include <lustre_net.h>
#include <lustre_sec.h>
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_net.h"
#include "../include/lustre_sec.h"
#include "ldlm_internal.h"
/* @priority: If non-zero, move the selected connection to the list head.

5
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
View File

@ -42,9 +42,8 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/lustre_intent.h>
#include <obd_class.h>
#include "../include/linux/lustre_intent.h"
#include "../include/obd_class.h"
#include "ldlm_internal.h"
/* lock types */

5
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
View File

@ -42,9 +42,8 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre_dlm.h>
#include <obd_class.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_class.h"
#include <linux/list.h>
#include "ldlm_internal.h"

6
drivers/staging/lustre/lustre/ldlm/ldlm_plain.c
View File

@ -52,9 +52,9 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include <lustre_dlm.h>
#include <obd_support.h>
#include <lustre_lib.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_support.h"
#include "../include/lustre_lib.h"
#include "ldlm_internal.h"

10
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c
View File

@ -97,12 +97,10 @@
#define DEBUG_SUBSYSTEM S_LDLM
# include <lustre_dlm.h>
#include <cl_object.h>
#include <obd_class.h>
#include <obd_support.h>
#include "../include/lustre_dlm.h"
#include "../include/cl_object.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "ldlm_internal.h"

6
drivers/staging/lustre/lustre/ldlm/ldlm_request.c
View File

@ -61,9 +61,9 @@
#define DEBUG_SUBSYSTEM S_LDLM
#include <lustre_dlm.h>
#include <obd_class.h>
#include <obd.h>
#include "../include/lustre_dlm.h"
#include "../include/obd_class.h"
#include "../include/obd.h"
#include "ldlm_internal.h"

7
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -40,10 +40,9 @@
*/
#define DEBUG_SUBSYSTEM S_LDLM
# include <lustre_dlm.h>
#include <lustre_fid.h>
#include <obd_class.h>
#include "../include/lustre_dlm.h"
#include "../include/lustre_fid.h"
#include "../include/obd_class.h"
#include "ldlm_internal.h"
struct kmem_cache *ldlm_resource_slab, *ldlm_lock_slab;

3
drivers/staging/lustre/lustre/ptlrpc/Makefile
View File

@ -20,6 +20,3 @@ ptlrpc-$(CONFIG_PROC_FS) += sec_lproc.o
ptlrpc-$(CONFIG_LUSTRE_TRANSLATE_ERRNOS) += errno.o
obj-$(CONFIG_PTLRPC_GSS) += gss/
ccflags-y := -I$(src)/../include

12
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -38,12 +38,12 @@
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_lib.h>
#include <lustre_ha.h>
#include <lustre_import.h>
#include <lustre_req_layout.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_lib.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_import.h"
#include "../include/lustre_req_layout.h"
#include "ptlrpc_internal.h"

6
drivers/staging/lustre/lustre/ptlrpc/connection.c
View File

@ -35,9 +35,9 @@
*/
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "ptlrpc_internal.h"

2
drivers/staging/lustre/lustre/ptlrpc/errno.c
View File

@ -26,7 +26,7 @@
*/
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre/lustre_errno.h>
#include "../include/lustre/lustre_errno.h"
/*
* The two translation tables below must define a one-to-one mapping between

6
drivers/staging/lustre/lustre/ptlrpc/events.c
View File

@ -41,9 +41,9 @@
# include <linux/kernel.h>
# endif
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_sec.h>
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_sec.h"
#include "ptlrpc_internal.h"
lnet_handle_eq_t ptlrpc_eq_h;

16
drivers/staging/lustre/lustre/ptlrpc/import.c
View File

@ -40,14 +40,14 @@
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <lustre_ha.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_export.h>
#include <obd.h>
#include <obd_cksum.h>
#include <obd_class.h>
#include "../include/obd_support.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_net.h"
#include "../include/lustre_import.h"
#include "../include/lustre_export.h"
#include "../include/obd.h"
#include "../include/obd_cksum.h"
#include "../include/obd_class.h"
#include "ptlrpc_internal.h"

16
drivers/staging/lustre/lustre/ptlrpc/layout.c
View File

@ -53,21 +53,21 @@
#include <linux/module.h>
/* LUSTRE_VERSION_CODE */
#include <lustre_ver.h>
#include "../include/lustre_ver.h"
#include <obd_support.h>
#include "../include/obd_support.h"
/* lustre_swab_mdt_body */
#include <lustre/lustre_idl.h>
#include "../include/lustre/lustre_idl.h"
/* obd2cli_tgt() (required by DEBUG_REQ()) */
#include <obd.h>
#include "../include/obd.h"
/* __REQ_LAYOUT_USER__ */
#endif
/* struct ptlrpc_request, lustre_msg* */
#include <lustre_req_layout.h>
#include <lustre_update.h>
#include <lustre_acl.h>
#include <lustre_debug.h>
#include "../include/lustre_req_layout.h"
#include "../include/lustre_update.h"
#include "../include/lustre_acl.h"
#include "../include/lustre_debug.h"
/*
* RQFs (see below) refer to two struct req_msg_field arrays describing the

6
drivers/staging/lustre/lustre/ptlrpc/llog_client.c
View File

@ -44,9 +44,9 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_class.h>
#include <lustre_log.h>
#include <lustre_net.h>
#include "../include/obd_class.h"
#include "../include/lustre_log.h"
#include "../include/lustre_net.h"
#include <linux/list.h>
#define LLOG_CLIENT_ENTRY(ctxt, imp) do { \

8
drivers/staging/lustre/lustre/ptlrpc/llog_net.c
View File

@ -48,11 +48,11 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_class.h>
#include <lustre_log.h>
#include "../include/obd_class.h"
#include "../include/lustre_log.h"
#include <linux/list.h>
#include <lvfs.h>
#include <lustre_fsfilt.h>
#include "../include/lvfs.h"
#include "../include/lustre_fsfilt.h"
int llog_initiator_connect(struct llog_ctxt *ctxt)
{

12
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c
View File

@ -36,12 +36,12 @@
#define DEBUG_SUBSYSTEM S_CLASS
#include <obd_support.h>
#include <obd.h>
#include <lprocfs_status.h>
#include <lustre/lustre_idl.h>
#include <lustre_net.h>
#include <obd_class.h>
#include "../include/obd_support.h"
#include "../include/obd.h"
#include "../include/lprocfs_status.h"
#include "../include/lustre/lustre_idl.h"
#include "../include/lustre_net.h"
#include "../include/obd_class.h"
#include "ptlrpc_internal.h"

10
drivers/staging/lustre/lustre/ptlrpc/niobuf.c
View File

@ -35,11 +35,11 @@
*/
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <lustre_net.h>
#include <lustre_lib.h>
#include <obd.h>
#include <obd_class.h>
#include "../include/obd_support.h"
#include "../include/lustre_net.h"
#include "../include/lustre_lib.h"
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "ptlrpc_internal.h"
/**

8
drivers/staging/lustre/lustre/ptlrpc/nrs.c
View File

@ -40,10 +40,10 @@
*/
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lprocfs_status.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lprocfs_status.h"
#include "../../include/linux/libcfs/libcfs.h"
#include "ptlrpc_internal.h"

4
drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c
View File

@ -47,8 +47,8 @@
*/
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../../include/linux/libcfs/libcfs.h"
#include "ptlrpc_internal.h"

10
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c
View File

@ -46,11 +46,11 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <obd_cksum.h>
#include <lustre/ll_fiemap.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/obd_cksum.h"
#include "../include/lustre/ll_fiemap.h"
static inline int lustre_msg_hdr_size_v2(int count)
{

10
drivers/staging/lustre/lustre/ptlrpc/pers.c
View File

@ -34,11 +34,11 @@
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_lib.h>
#include <lustre_ha.h>
#include <lustre_import.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_lib.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_import.h"
#include "ptlrpc_internal.h"

4
drivers/staging/lustre/lustre/ptlrpc/pinger.c
View File

@ -40,8 +40,8 @@
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "ptlrpc_internal.h"
static int suppress_pings;

8
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c
View File

@ -37,10 +37,10 @@
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_req_layout.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_req_layout.h"
#include "ptlrpc_internal.h"

15
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c
View File

@ -57,14 +57,13 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <lustre_net.h>
# include <lustre_lib.h>
#include <lustre_ha.h>
#include <obd_class.h> /* for obd_zombie */
#include <obd_support.h> /* for OBD_FAIL_CHECK */
#include <cl_object.h> /* cl_env_{get,put}() */
#include <lprocfs_status.h>
#include "../include/lustre_net.h"
#include "../include/lustre_lib.h"
#include "../include/lustre_ha.h"
#include "../include/obd_class.h" /* for obd_zombie */
#include "../include/obd_support.h" /* for OBD_FAIL_CHECK */
#include "../include/cl_object.h" /* cl_env_{get,put}() */
#include "../include/lprocfs_status.h"
#include "ptlrpc_internal.h"

16
drivers/staging/lustre/lustre/ptlrpc/recover.c
View File

@ -41,14 +41,14 @@
#define DEBUG_SUBSYSTEM S_RPC
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_support.h>
#include <lustre_ha.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_export.h>
#include <obd.h>
#include <obd_ost.h>
#include <obd_class.h>
#include "../include/obd_support.h"
#include "../include/lustre_ha.h"
#include "../include/lustre_net.h"
#include "../include/lustre_import.h"
#include "../include/lustre_export.h"
#include "../include/obd.h"
#include "../include/obd_ost.h"
#include "../include/obd_class.h"
#include <linux/list.h>
#include "ptlrpc_internal.h"

14
drivers/staging/lustre/lustre/ptlrpc/sec.c
View File

@ -44,13 +44,13 @@
#include <linux/crypto.h>
#include <linux/key.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_dlm.h>
#include <lustre_sec.h>
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_net.h"
#include "../include/lustre_import.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_sec.h"
#include "ptlrpc_internal.h"

16
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
View File

@ -43,14 +43,14 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/crypto.h>
#include <obd.h>
#include <obd_cksum.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_dlm.h>
#include <lustre_sec.h>
#include "../include/obd.h"
#include "../include/obd_cksum.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_net.h"
#include "../include/lustre_import.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_sec.h"
#include "ptlrpc_internal.h"

20
drivers/staging/lustre/lustre/ptlrpc/sec_config.c
View File

@ -40,16 +40,16 @@
#include <linux/crypto.h>
#include <linux/key.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_log.h>
#include <lustre_disk.h>
#include <lustre_dlm.h>
#include <lustre_param.h>
#include <lustre_sec.h>
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_net.h"
#include "../include/lustre_import.h"
#include "../include/lustre_log.h"
#include "../include/lustre_disk.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_param.h"
#include "../include/lustre_sec.h"
#include "ptlrpc_internal.h"

8
drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
View File

@ -42,10 +42,10 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_sec.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_sec.h"
#define SEC_GC_INTERVAL (30 * 60)

14
drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c
View File

@ -41,13 +41,13 @@
#include "../../include/linux/libcfs/libcfs.h"
#include <linux/crypto.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_support.h>
#include <lustre_net.h>
#include <lustre_import.h>
#include <lustre_dlm.h>
#include <lustre_sec.h>
#include "../include/obd.h"
#include "../include/obd_class.h"
#include "../include/obd_support.h"
#include "../include/lustre_net.h"
#include "../include/lustre_import.h"
#include "../include/lustre_dlm.h"
#include "../include/lustre_sec.h"
#include "ptlrpc_internal.h"

10
drivers/staging/lustre/lustre/ptlrpc/sec_null.c
View File

@ -41,11 +41,11 @@
#define DEBUG_SUBSYSTEM S_SEC
#include <obd_support.h>
#include <obd_cksum.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_sec.h>
#include "../include/obd_support.h"
#include "../include/obd_cksum.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_sec.h"
static struct ptlrpc_sec_policy null_policy;
static struct ptlrpc_sec null_sec;

10
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c
View File

@ -41,11 +41,11 @@
#define DEBUG_SUBSYSTEM S_SEC
#include <obd_support.h>
#include <obd_cksum.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_sec.h>
#include "../include/obd_support.h"
#include "../include/obd_cksum.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_sec.h"
struct plain_sec {
struct ptlrpc_sec pls_base;

8
drivers/staging/lustre/lustre/ptlrpc/service.c
View File

@ -35,10 +35,10 @@
*/
#define DEBUG_SUBSYSTEM S_RPC
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lu_object.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lu_object.h"
#include "../../include/linux/lnet/types.h"
#include "ptlrpc_internal.h"

8
drivers/staging/lustre/lustre/ptlrpc/wiretest.c
View File

@ -39,10 +39,10 @@
#include <linux/fs.h>
#include <linux/posix_acl_xattr.h>
#include <obd_support.h>
#include <obd_class.h>
#include <lustre_net.h>
#include <lustre_disk.h>
#include "../include/obd_support.h"
#include "../include/obd_class.h"
#include "../include/lustre_net.h"
#include "../include/lustre_disk.h"
void lustre_assert_wire_constants(void)
{
/* Wire protocol assertions generated by 'wirecheck'