staging: lustre: #include neatening

PATCH In review Joe Perches 4 participants 11 messages Aug 15, 2016 – Aug 16, 2016

Subsystems (2)

Staging Kbuild

lore

Share & tools

lore

Joe Perches

author

2016-08-15 19:33 UTC #0 lore raw

cover staging: lustre: #include neatening

Make it a bit easier to grep and help a future move out of staging.

Joe Perches (2):
staging: lustre: Add include path to Makefile
staging: lustre: Remove .. paths from '#include "' uses

 drivers/staging/lustre/Makefile                             |  3 +++
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h         |  6 +++---
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h         |  8 ++++----
 drivers/staging/lustre/lnet/libcfs/debug.c                  |  2 +-
 drivers/staging/lustre/lnet/libcfs/fail.c                   |  2 +-
 drivers/staging/lustre/lnet/libcfs/hash.c                   |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c             |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_lock.c            |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_mem.c             |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_string.c          |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c        |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c     |  4 ++--
 drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c    |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c      |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c        |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c     |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c       |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c  |  2 +-
 drivers/staging/lustre/lnet/libcfs/module.c                 | 10 +++++-----
 drivers/staging/lustre/lnet/libcfs/prng.c                   |  2 +-
 drivers/staging/lustre/lnet/libcfs/tracefile.c              |  2 +-
 drivers/staging/lustre/lnet/libcfs/tracefile.h              |  2 +-
 drivers/staging/lustre/lnet/libcfs/workitem.c               |  2 +-
 drivers/staging/lustre/lnet/lnet/acceptor.c                 |  2 +-
 drivers/staging/lustre/lnet/lnet/api-ni.c                   |  4 ++--
 drivers/staging/lustre/lnet/lnet/config.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-eq.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-md.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-me.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-move.c                 |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-msg.c                  |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c                  |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-socket.c               |  4 ++--
 drivers/staging/lustre/lnet/lnet/lo.c                       |  2 +-
 drivers/staging/lustre/lnet/lnet/module.c                   |  4 ++--
 drivers/staging/lustre/lnet/lnet/net_fault.c                |  4 ++--
 drivers/staging/lustre/lnet/lnet/nidstrings.c               |  4 ++--
 drivers/staging/lustre/lnet/lnet/peer.c                     |  4 ++--
 drivers/staging/lustre/lnet/lnet/router.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/router_proc.c              |  4 ++--
 drivers/staging/lustre/lnet/selftest/conctl.c               |  6 +++---
 drivers/staging/lustre/lnet/selftest/conrpc.c               |  4 ++--
 drivers/staging/lustre/lnet/selftest/conrpc.h               |  8 ++++----
 drivers/staging/lustre/lnet/selftest/console.c              |  4 ++--
 drivers/staging/lustre/lnet/selftest/console.h              |  8 ++++----
 drivers/staging/lustre/lnet/selftest/rpc.h                  |  2 +-
 drivers/staging/lustre/lnet/selftest/selftest.h             | 10 +++++-----
 drivers/staging/lustre/lustre/fid/fid_internal.h            |  2 +-
 drivers/staging/lustre/lustre/fid/fid_lib.c                 |  2 +-
 drivers/staging/lustre/lustre/fid/fid_request.c             |  2 +-
 drivers/staging/lustre/lustre/fid/lproc_fid.c               |  2 +-
 drivers/staging/lustre/lustre/fld/fld_cache.c               |  2 +-
 drivers/staging/lustre/lustre/fld/fld_internal.h            |  2 +-
 drivers/staging/lustre/lustre/fld/fld_request.c             |  2 +-
 drivers/staging/lustre/lustre/fld/lproc_fld.c               |  2 +-
 drivers/staging/lustre/lustre/include/interval_tree.h       |  2 +-
 drivers/staging/lustre/lustre/include/linux/lustre_lite.h   |  2 +-
 drivers/staging/lustre/lustre/include/lu_object.h           |  2 +-
 drivers/staging/lustre/lustre/include/lustre/lustre_idl.h   |  4 ++--
 drivers/staging/lustre/lustre/include/lustre_disk.h         |  4 ++--
 drivers/staging/lustre/lustre/include/lustre_fid.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_fld.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_handles.h      |  2 +-
 drivers/staging/lustre/lustre/include/lustre_lib.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_mdc.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_mds.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_net.h          |  6 +++---
 drivers/staging/lustre/lustre/include/obd_cksum.h           |  4 ++--
 drivers/staging/lustre/lustre/include/obd_support.h         |  2 +-
 drivers/staging/lustre/lustre/ldlm/l_lock.c                 |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c            |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c               |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c              |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c             |  2 +-
 drivers/staging/lustre/lustre/llite/glimpse.c               |  2 +-
 drivers/staging/lustre/lustre/llite/lcommon_cl.c            |  2 +-
 drivers/staging/lustre/lustre/llite/llite_mmap.c            |  2 +-
 drivers/staging/lustre/lustre/llite/rw.c                    |  2 +-
 drivers/staging/lustre/lustre/llite/rw26.c                  |  2 +-
 drivers/staging/lustre/lustre/llite/vvp_object.c            |  2 +-
 drivers/staging/lustre/lustre/lov/lov_cl_internal.h         |  2 +-
 drivers/staging/lustre/lustre/lov/lov_ea.c                  |  2 +-
 drivers/staging/lustre/lustre/lov/lov_merge.c               |  2 +-
 drivers/staging/lustre/lustre/lov/lov_obd.c                 |  2 +-
 drivers/staging/lustre/lustre/lov/lov_offset.c              |  2 +-
 drivers/staging/lustre/lustre/lov/lov_pool.c                |  2 +-
 drivers/staging/lustre/lustre/lov/lov_request.c             |  2 +-
 drivers/staging/lustre/lustre/mgc/mgc_internal.h            |  2 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c          |  4 ++--
 drivers/staging/lustre/lustre/obdclass/cl_page.c            |  2 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c          |  2 +-
 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c |  4 ++--
 drivers/staging/lustre/lustre/obdclass/lu_object.c          |  4 ++--
 drivers/staging/lustre/lustre/obdclass/lu_ref.c             |  2 +-
 drivers/staging/lustre/lustre/obdclass/obd_mount.c          |  2 +-
 drivers/staging/lustre/lustre/obdclass/uuid.c               |  2 +-
 drivers/staging/lustre/lustre/obdecho/echo_client.c         |  2 +-
 drivers/staging/lustre/lustre/osc/osc_cl_internal.h         |  2 +-
 drivers/staging/lustre/lustre/osc/osc_lock.c                |  2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/errno.c                |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/events.c               |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_client.c          |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_net.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs.c                  |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/pack_generic.c         |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c              |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/recover.c              |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec.c                  |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_config.c           |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c               |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c            |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c              |  2 +-
 115 files changed, 156 insertions(+), 153 deletions(-)

Signature · 1 line

2.8.0.rc4.16.g56331f8

Joe Perches

author

2016-08-15 19:33 UTC #1 lore raw

PATCH 1/2 staging: lustre: Add include path to Makefile

Start to rationalize include paths in source code files.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/lustre/Makefile | 3 +++
 1 file changed, 3 insertions(+)

drivers/staging/lustre/Makefile +3 -0

index 95ffe33..9d00237 100644
@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
 obj-$(CONFIG_LNET)		+= lnet/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/

Signature · 1 line

2.8.0.rc4.16.g56331f8

Greg Kroah-Hartman

maintainer

2016-08-15 21:04 UTC #2 lore raw

Re: [PATCH 1/2] staging: lustre: Add include path to Makefile

Quoted 12 lines · Joe Perches

Start to rationalize include paths in source code files.
Signed-off-by Joe Perches <[email protected]>
---
 drivers/staging/lustre/Makefile | 3 +++
 1 file changed, 3 insertions(+)
drivers/staging/lustre/Makefile +0 -0
index 95ffe33..9d00237 100644

drivers/staging/lustre/Makefile line 5

Quoted 5 lines

drivers/staging/lustre/Makefile +3 -0

@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
 obj-$(CONFIG_LNET)		+= lnet/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/

This is good, but does this break the subdir make command:
make M=drivers/staging/lustre/foo_dir/
?

I remember the last time I tried to clean this up, it took a while...

thanks,

greg k-h

James Simmons

2016-08-15 21:08 UTC #3 lore raw

Re: [lustre-devel] [PATCH 1/2] staging: lustre: Add include path to Makefile

Quoted 24 lines · Joe Perches

Quoted 12 lines
Start to rationalize include paths in source code files.
Signed-off-by Joe Perches <[email protected]>
---
 drivers/staging/lustre/Makefile | 3 +++
 1 file changed, 3 insertions(+)
drivers/staging/lustre/Makefile +0 -0
index 95ffe33..9d00237 100644
drivers/staging/lustre/Makefile line 5
Quoted 5 lines
drivers/staging/lustre/Makefile +3 -0
@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
 obj-$(CONFIG_LNET)		+= lnet/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/
This is good, but does this break the subdir make command:
make M=drivers/staging/lustre/foo_dir/
?

Quoted 1 line

I remember the last time I tried to clean this up, it took a while...

It breaks make M=drivers/staging/lustre/foo_dir

Joe Perches

author

2016-08-15 21:14 UTC #4 lore raw

Re: [PATCH 1/2] staging: lustre: Add include path to Makefile

In reply to Greg Kroah-Hartman

Quoted 2 lines · Greg Kroah-Hartman

Quoted 1 line · Joe Perches
Start to rationalize include paths in source code files.

[]

Quoted 1 line

drivers/staging/lustre/Makefile
Quoted 1 line
drivers/staging/lustre/Makefile +0 -0

[]

Quoted 9 lines

Quoted 6 lines
drivers/staging/lustre/Makefile +3 -0
@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
?obj-$(CONFIG_LNET) += lnet/
?obj-$(CONFIG_LUSTRE_FS) += lustre/
This is good, but does this break the subdir make command:
make M=drivers/staging/lustre/foo_dir/
?

hmm, yeah, it does. ?Oh well, nevermind for awhile.

Quoted 1 line

I remember the last time I tried to clean this up, it took a while...

It seems like something the build tools should
handle correctly now, but I'll look at it.

No rush.

Joe Perches

author

2016-08-15 21:29 UTC #5 lore raw

Building a subdirectory ignores parent subdir-ccflags (was: Re: [PATCH 1/2] staging: lustre: Add include path to Makefile)

Quoted 15 lines · Joe Perches

Quoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Joe Perches
Start to rationalize include paths in source code files.
[]
Quoted 1 line
drivers/staging/lustre/Makefile
Quoted 1 line
drivers/staging/lustre/Makefile +0 -0
[]
Quoted 9 lines
Quoted 6 lines
drivers/staging/lustre/Makefile +3 -0
@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
?obj-$(CONFIG_LNET) += lnet/
?obj-$(CONFIG_LUSTRE_FS) += lustre/
This is good, but does this break the subdir make command:
make M=drivers/staging/lustre/foo_dir/
?

Quoted 4 lines

hmm, yeah, it does. ?Oh well, nevermind for awhile.
Quoted 1 line
I remember the last time I tried to clean this up, it took a while...
It seems like something the build tools should
handle correctly now, but I'll look at it.

Perhaps making a specific directory should also walk up any parent directory Makefiles looking for subdir flags.

Is that unreasonable? Any suggestions?

Michal Marek

2016-08-15 22:07 UTC #6 lore raw

Re: Building a subdirectory ignores parent subdir-ccflags

Dne 15.8.2016 v 23:29 Joe Perches napsal(a):

Quoted 17 lines · Joe Perches

Quoted 16 lines · Greg Kroah-Hartman
Quoted 2 lines · Joe Perches
Quoted 1 line
Start to rationalize include paths in source code files.
[]
Quoted 1 line
drivers/staging/lustre/Makefile
Quoted 1 line
drivers/staging/lustre/Makefile +0 -0
[]
Quoted 9 lines
drivers/staging/lustre/Makefile line 5
Quoted 6 lines
drivers/staging/lustre/Makefile +3 -0
@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
 obj-$(CONFIG_LNET)		+= lnet/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/
This is good, but does this break the subdir make command:
make M=drivers/staging/lustre/foo_dir/
?
hmm, yeah, it does. Oh well, nevermind for awhile.

Quoted 8 lines

Quoted 3 lines
Quoted 1 line
I remember the last time I tried to clean this up, it took a while...
It seems like something the build tools should
handle correctly now, but I'll look at it.
Perhaps making a specific directory should also walk up any parent directory Makefiles looking for subdir flags.
Is that unreasonable? Any suggestions?

I suggest to do make drivers/staging/lustre/. If building the lustre subdirectories is going to be a common use case, then you can propagate the subdir-ccflags-y assignment down to the individual Makefiles.

Michal

Joe Perches

author

2016-08-15 22:46 UTC #7 lore raw

Re: Building a subdirectory ignores parent subdir-ccflags

On Tue, 2016-08-16 at 00:07 +0200, Michal Marek wrote:

Hi Michal.

Quoted 7 lines

Quoted 4 lines
Perhaps making a specific directory should also walk up any parent directory Makefiles looking for subdir flags.
Is that unreasonable???Any suggestions?
I suggest to do make drivers/staging/lustre/. If building the lustre subdirectories is going to be a common use case, then you can propagate the subdir-ccflags-y assignment down to the individual Makefiles.

I don't have a problem with that.

Others might though for whatever reason.

There are a couple other places in the tree that also use subdir-ccflags where the results of making a subdirectory would either fail or have unexpected results.

Does it matter? ?Not much, but it could be nicer if it's possible for parent Makefile paths to be ascended.

I'm not much of a Makefile person, but perhaps you have some clues/tips/suggestions for implementation?

Greg Kroah-Hartman

maintainer

2016-08-16 10:53 UTC #8 lore raw

Re: [PATCH 1/2] staging: lustre: Add include path to Makefile

In reply to Joe Perches

Quoted 16 lines · Joe Perches

Quoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Joe Perches
Start to rationalize include paths in source code files.
[]
Quoted 1 line
drivers/staging/lustre/Makefile
Quoted 1 line
drivers/staging/lustre/Makefile +0 -0
[]
Quoted 9 lines
Quoted 6 lines
drivers/staging/lustre/Makefile +3 -0
@@ -1,2 +1,5 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include/
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/
+
obj-$(CONFIG_LNET) += lnet/
obj-$(CONFIG_LUSTRE_FS) += lustre/
This is good, but does this break the subdir make command:
make M=drivers/staging/lustre/foo_dir/
?

Quoted 6 lines

hmm, yeah, it does. Oh well, nevermind for awhile.
Quoted 1 line
I remember the last time I tried to clean this up, it took a while...
It seems like something the build tools should
handle correctly now, but I'll look at it.

Nah, I think it's fine the way it is. What's wrong with the "../" type things in the include directives? The build system works well with it, you can build any single module or file correctly, and it's obvious what the code is including from.

Now you might argue that the lustre code shouldn't have such a mess of include files like this, and I would totally agree. I suggest working on reducing the number of .h files they have, and centralizing them such that all of these cross-directory includes aren't needed anymore either in the build directives, or in the .c files.

thanks,

greg k-h

Joe Perches

author

2016-08-16 11:01 UTC #9 lore raw

Re: [PATCH 1/2] staging: lustre: Add include path to Makefile

Quoted 4 lines · Greg Kroah-Hartman

Quoted 3 lines · Joe Perches
Quoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Joe Perches
Start to rationalize include paths in source code files.

[]

Quoted 2 lines

Nah, I think it's fine the way it is.??What's wrong with the "../" type things in the include directives?

.. path specific includes are unnecessarily file layout sensitive.

There are identically named .h files in separate directories.

The idea was to isolate the uapi type .h files from local ones.

I'll just give this up and let the lustre folks handle it.

Joe Perches

author

2016-08-15 19:33 UTC #10 lore raw

PATCH 2/2 staging: lustre: Remove .. paths from '#include "' uses

In reply to Joe Perches

Make the include paths a bit easier to find and more compatible to a future move out of the staging tree.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h         |  6 +++---
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h         |  8 ++++----
 drivers/staging/lustre/lnet/libcfs/debug.c                  |  2 +-
 drivers/staging/lustre/lnet/libcfs/fail.c                   |  2 +-
 drivers/staging/lustre/lnet/libcfs/hash.c                   |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c             |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_lock.c            |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_mem.c             |  2 +-
 drivers/staging/lustre/lnet/libcfs/libcfs_string.c          |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c        |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c     |  4 ++--
 drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c    |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c      |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c        |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c     |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c       |  2 +-
 drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c  |  2 +-
 drivers/staging/lustre/lnet/libcfs/module.c                 | 10 +++++-----
 drivers/staging/lustre/lnet/libcfs/prng.c                   |  2 +-
 drivers/staging/lustre/lnet/libcfs/tracefile.c              |  2 +-
 drivers/staging/lustre/lnet/libcfs/tracefile.h              |  2 +-
 drivers/staging/lustre/lnet/libcfs/workitem.c               |  2 +-
 drivers/staging/lustre/lnet/lnet/acceptor.c                 |  2 +-
 drivers/staging/lustre/lnet/lnet/api-ni.c                   |  4 ++--
 drivers/staging/lustre/lnet/lnet/config.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-eq.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-md.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-me.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-move.c                 |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-msg.c                  |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c                  |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-socket.c               |  4 ++--
 drivers/staging/lustre/lnet/lnet/lo.c                       |  2 +-
 drivers/staging/lustre/lnet/lnet/module.c                   |  4 ++--
 drivers/staging/lustre/lnet/lnet/net_fault.c                |  4 ++--
 drivers/staging/lustre/lnet/lnet/nidstrings.c               |  4 ++--
 drivers/staging/lustre/lnet/lnet/peer.c                     |  4 ++--
 drivers/staging/lustre/lnet/lnet/router.c                   |  2 +-
 drivers/staging/lustre/lnet/lnet/router_proc.c              |  4 ++--
 drivers/staging/lustre/lnet/selftest/conctl.c               |  6 +++---
 drivers/staging/lustre/lnet/selftest/conrpc.c               |  4 ++--
 drivers/staging/lustre/lnet/selftest/conrpc.h               |  8 ++++----
 drivers/staging/lustre/lnet/selftest/console.c              |  4 ++--
 drivers/staging/lustre/lnet/selftest/console.h              |  8 ++++----
 drivers/staging/lustre/lnet/selftest/rpc.h                  |  2 +-
 drivers/staging/lustre/lnet/selftest/selftest.h             | 10 +++++-----
 drivers/staging/lustre/lustre/fid/fid_internal.h            |  2 +-
 drivers/staging/lustre/lustre/fid/fid_lib.c                 |  2 +-
 drivers/staging/lustre/lustre/fid/fid_request.c             |  2 +-
 drivers/staging/lustre/lustre/fid/lproc_fid.c               |  2 +-
 drivers/staging/lustre/lustre/fld/fld_cache.c               |  2 +-
 drivers/staging/lustre/lustre/fld/fld_internal.h            |  2 +-
 drivers/staging/lustre/lustre/fld/fld_request.c             |  2 +-
 drivers/staging/lustre/lustre/fld/lproc_fld.c               |  2 +-
 drivers/staging/lustre/lustre/include/interval_tree.h       |  2 +-
 drivers/staging/lustre/lustre/include/linux/lustre_lite.h   |  2 +-
 drivers/staging/lustre/lustre/include/lu_object.h           |  2 +-
 drivers/staging/lustre/lustre/include/lustre/lustre_idl.h   |  4 ++--
 drivers/staging/lustre/lustre/include/lustre_disk.h         |  4 ++--
 drivers/staging/lustre/lustre/include/lustre_fid.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_fld.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_handles.h      |  2 +-
 drivers/staging/lustre/lustre/include/lustre_lib.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_mdc.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_mds.h          |  2 +-
 drivers/staging/lustre/lustre/include/lustre_net.h          |  6 +++---
 drivers/staging/lustre/lustre/include/obd_cksum.h           |  4 ++--
 drivers/staging/lustre/lustre/include/obd_support.h         |  2 +-
 drivers/staging/lustre/lustre/ldlm/l_lock.c                 |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c            |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c               |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c              |  2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c             |  2 +-
 drivers/staging/lustre/lustre/llite/glimpse.c               |  2 +-
 drivers/staging/lustre/lustre/llite/lcommon_cl.c            |  2 +-
 drivers/staging/lustre/lustre/llite/llite_mmap.c            |  2 +-
 drivers/staging/lustre/lustre/llite/rw.c                    |  2 +-
 drivers/staging/lustre/lustre/llite/rw26.c                  |  2 +-
 drivers/staging/lustre/lustre/llite/vvp_object.c            |  2 +-
 drivers/staging/lustre/lustre/lov/lov_cl_internal.h         |  2 +-
 drivers/staging/lustre/lustre/lov/lov_ea.c                  |  2 +-
 drivers/staging/lustre/lustre/lov/lov_merge.c               |  2 +-
 drivers/staging/lustre/lustre/lov/lov_obd.c                 |  2 +-
 drivers/staging/lustre/lustre/lov/lov_offset.c              |  2 +-
 drivers/staging/lustre/lustre/lov/lov_pool.c                |  2 +-
 drivers/staging/lustre/lustre/lov/lov_request.c             |  2 +-
 drivers/staging/lustre/lustre/mgc/mgc_internal.h            |  2 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c          |  4 ++--
 drivers/staging/lustre/lustre/obdclass/cl_page.c            |  2 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c          |  2 +-
 drivers/staging/lustre/lustre/obdclass/linux/linux-module.c |  4 ++--
 drivers/staging/lustre/lustre/obdclass/lu_object.c          |  4 ++--
 drivers/staging/lustre/lustre/obdclass/lu_ref.c             |  2 +-
 drivers/staging/lustre/lustre/obdclass/obd_mount.c          |  2 +-
 drivers/staging/lustre/lustre/obdclass/uuid.c               |  2 +-
 drivers/staging/lustre/lustre/obdecho/echo_client.c         |  2 +-
 drivers/staging/lustre/lustre/osc/osc_cl_internal.h         |  2 +-
 drivers/staging/lustre/lustre/osc/osc_lock.c                |  2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/errno.c                |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/events.c               |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_client.c          |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_net.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs.c                  |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/pack_generic.c         |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c              |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/recover.c              |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec.c                  |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c             |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_config.c           |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c               |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c            |  2 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c              |  2 +-
 114 files changed, 153 insertions(+), 153 deletions(-)

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +3 -3

index 078a0c3..3a28797 100644
@@ -63,9 +63,9 @@
 
 #define DEBUG_SUBSYSTEM S_LND
 
-#include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/lnet/lnet.h"
-#include "../../../include/linux/lnet/lib-lnet.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 #define IBLND_PEER_HASH_SIZE		101	/* # peer lists */
 /* # scheduler loops before reschedule */

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h +4 -4

index a56632b..b143ed4 100644
@@ -46,10 +46,10 @@
 #include <net/sock.h>
 #include <net/tcp.h>
 
-#include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/lnet/lnet.h"
-#include "../../../include/linux/lnet/lib-lnet.h"
-#include "../../../include/linux/lnet/socklnd.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnet.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/socklnd.h"
 
 /* assume one thread for each connection type */
 #define SOCKNAL_NSCHEDS		3

drivers/staging/lustre/lnet/libcfs/debug.c +1 -1

index 42b15a7..2561c5f 100644
@@ -37,7 +37,7 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "tracefile.h"
 
 static char debug_file_name[1024];

drivers/staging/lustre/lnet/libcfs/fail.c +1 -1

index 9288ee0..d1eb232 100644
@@ -29,7 +29,7 @@
  * Lustre is a trademark of Oracle Corporation, Inc.
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 unsigned long cfs_fail_loc;
 EXPORT_SYMBOL(cfs_fail_loc);

drivers/staging/lustre/lnet/libcfs/hash.c +1 -1

index 23283b6..b28dea9 100644
@@ -105,7 +105,7 @@
 #include <linux/seq_file.h>
 #include <linux/log2.h>
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #if CFS_HASH_DEBUG_LEVEL >= CFS_HASH_DEBUG_1
 static unsigned int warn_on_depth = 8;

drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c +1 -1

index 33352af..e5d3aac 100644
@@ -30,7 +30,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /** Global CPU partition table */
 struct cfs_cpt_table   *cfs_cpt_table __read_mostly;

drivers/staging/lustre/lnet/libcfs/libcfs_lock.c +1 -1

index 83543f9..fe3c0cd 100644
@@ -27,7 +27,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /** destroy cpu-partition lock, see libcfs_private.h for more detail */
 void

drivers/staging/lustre/lnet/libcfs/libcfs_mem.c +1 -1

index d0e81bb..9cc293a 100644
@@ -28,7 +28,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 struct cfs_var_array {
 	unsigned int		va_count;	/* # of buffers */

drivers/staging/lustre/lnet/libcfs/libcfs_string.c +1 -1

index fc697cd..f76ceb2 100644
@@ -36,7 +36,7 @@
  * Author: Nathan Rutman <[email protected]>
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /* Convert a text string to a bitmask */
 int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),

drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c +1 -1

index b52518c5..f0c706a 100644
@@ -31,7 +31,7 @@
 
 #include <linux/cpu.h>
 #include <linux/sched.h>
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #ifdef CONFIG_SMP

drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c +2 -2

index 5c0116a..d575c5a 100644
@@ -29,8 +29,8 @@
 
 #include <crypto/hash.h>
 #include <linux/scatterlist.h>
-#include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/libcfs/libcfs_crypto.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs_crypto.h"
 #include "linux-crypto.h"
 
 /**

drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c +1 -1

index 3e22cad..d1e05a6 100644
@@ -44,7 +44,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /*
  * Implementation of cfs_curproc API (see portals/include/libcfs/curproc.h)

drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c +1 -1

index 435b784..39ac92e 100644
@@ -51,7 +51,7 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../tracefile.h"

drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c +1 -1

index a6a76a6..2186aed 100644
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 void *libcfs_kvzalloc(size_t size, gfp_t flags)
 {

drivers/staging/lustre/lnet/libcfs/linux/linux-module.c +1 -1

index 38308f8..d83a347 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #define LNET_MINOR 240

drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c +1 -1

index 291d286..771f573 100644
@@ -36,7 +36,7 @@
 #include <linux/fs_struct.h>
 #include <linux/sched.h>
 
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #if defined(CONFIG_KGDB)
 #include <linux/kgdb.h>

drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c +1 -1

index 8b551d27..9ac79e2 100644
@@ -33,7 +33,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE
 
-#include "../../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../tracefile.h"
 
 /* percents to share the total debug memory for each type */

drivers/staging/lustre/lnet/libcfs/module.c +5 -5

index 86b4d25..e197263 100644
@@ -50,13 +50,13 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <asm/div64.h>
 
-#include "../../include/linux/libcfs/libcfs_crypto.h"
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
-#include "../../include/linux/lnet/lnet.h"
+#include "linux/libcfs/libcfs_crypto.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-dlc.h"
+#include "linux/lnet/lnet.h"
 #include "tracefile.h"
 
 static struct dentry *lnet_debugfs_root;

drivers/staging/lustre/lnet/libcfs/prng.c +1 -1

index a9bdb28..8719494 100644
@@ -35,7 +35,7 @@
  * algorithm recommended by Marsaglia
 */
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /*
  * From: George Marsaglia <[email protected]>

drivers/staging/lustre/lnet/libcfs/tracefile.c +1 -1

index 1c7efdf..6f245ea 100644
@@ -39,7 +39,7 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 #include "tracefile.h"
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /* XXX move things up to the top, comment */
 union cfs_trace_data_union (*cfs_trace_data[TCD_MAX_TYPES])[NR_CPUS] __cacheline_aligned;

drivers/staging/lustre/lnet/libcfs/tracefile.h +1 -1

index d878676..6016012 100644
@@ -33,7 +33,7 @@
 #ifndef __LIBCFS_TRACEFILE_H__
 #define __LIBCFS_TRACEFILE_H__
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 enum cfs_trace_buf_type {
 	CFS_TCD_TYPE_PROC = 0,

drivers/staging/lustre/lnet/libcfs/workitem.c +1 -1

index e98c818..4f6bb5a 100644
@@ -37,7 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #define CFS_WS_NAME_LEN	 16

drivers/staging/lustre/lnet/lnet/acceptor.c +1 -1

index 8c50c99..12c90a9 100644
@@ -33,7 +33,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #include <linux/completion.h>
 #include <net/sock.h>
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 static int   accept_port    = 988;
 static int   accept_backlog = 127;

drivers/staging/lustre/lnet/lnet/api-ni.c +2 -2

index 346db89..a2420be 100644
@@ -34,8 +34,8 @@
 #include <linux/log2.h>
 #include <linux/ktime.h>
 
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-dlc.h"
 
 #define D_LNI D_CONSOLE

drivers/staging/lustre/lnet/lnet/config.c +1 -1

index a72afdf..ef7c9c0 100644
@@ -31,7 +31,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 struct lnet_text_buf {	    /* tmp struct for parsing routes */
 	struct list_head ltb_list;	/* stash on lists */

drivers/staging/lustre/lnet/lnet/lib-eq.c +1 -1

index d05c6cc..7a02aa4 100644
@@ -35,7 +35,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 /**
  * Create an event queue that has room for \a count number of events.

drivers/staging/lustre/lnet/lnet/lib-md.c +1 -1

index 1834bf7..408f58e 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 /* must be called with lnet_res_lock held */
 void

drivers/staging/lustre/lnet/lnet/lib-me.c +1 -1

index b430046..5087065 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 /**
  * Create and attach a match entry to the match list of \a portal. The new

drivers/staging/lustre/lnet/lnet/lib-move.c +1 -1

index e6d3b80..46da43b 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 static int local_nid_dist_zero = 1;
 module_param(local_nid_dist_zero, int, 0444);

drivers/staging/lustre/lnet/lnet/lib-msg.c +1 -1

index 910e106..fff14ce 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 void
 lnet_build_unlink_event(lnet_libmd_t *md, lnet_event_t *ev)

drivers/staging/lustre/lnet/lnet/lib-ptl.c +1 -1

index 3947e8b..a186871 100644
@@ -31,7 +31,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 /* NB: add /proc interfaces in upcoming patches */
 int portal_rotor = LNET_PTL_ROTOR_HASH_RT;

drivers/staging/lustre/lnet/lnet/lib-socket.c +2 -2

index 891fd59..eabc999 100644
@@ -40,8 +40,8 @@
 #include <linux/syscalls.h>
 #include <net/sock.h>
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lib-lnet.h"
 
 static int
 kernel_sock_unlocked_ioctl(struct file *filp, int cmd, unsigned long arg)

drivers/staging/lustre/lnet/lnet/lo.c +1 -1

index 08402712..f6c198e 100644
@@ -29,7 +29,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 static int
 lolnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)

drivers/staging/lustre/lnet/lnet/module.c +2 -2

index 4ffbd3e..7b489f5 100644
@@ -31,8 +31,8 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-dlc.h"
 
 static int config_on_load;
 module_param(config_on_load, int, 0444);

drivers/staging/lustre/lnet/lnet/net_fault.c +2 -2

index e4aceb7..d9d51c9 100644
@@ -35,8 +35,8 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lnetctl.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lnetctl.h"
 
 #define LNET_MSG_MASK		(LNET_PUT_BIT | LNET_ACK_BIT | \
 				 LNET_GET_BIT | LNET_REPLY_BIT)

drivers/staging/lustre/lnet/lnet/nidstrings.c +2 -2

index a6d7a61..de61fd3 100644
@@ -36,8 +36,8 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lnet.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnet.h"
 
 /* max value for numeric network address */
 #define MAX_NUMERIC_VALUE 0xffffffff

drivers/staging/lustre/lnet/lnet/peer.c +2 -2

index e806191..d84be85 100644
@@ -34,8 +34,8 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-dlc.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-dlc.h"
 
 int
 lnet_peer_tables_create(void)

drivers/staging/lustre/lnet/lnet/router.c +1 -1

index 0635432..a9e9fc5 100644
@@ -19,7 +19,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 #include <linux/completion.h>
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-lnet.h"
 
 #define LNET_NRB_TINY_MIN	512	/* min value for each CPT */
 #define LNET_NRB_TINY		(LNET_NRB_TINY_MIN * 4)

drivers/staging/lustre/lnet/lnet/router_proc.c +2 -2

index 65f65a3..aaa8f69 100644
@@ -18,8 +18,8 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lib-lnet.h"
 
 /*
  * This is really lnet_proc.c. You might need to update sanity test 215

drivers/staging/lustre/lnet/selftest/conctl.c +3 -3

index b786f8b..29cac38 100644
@@ -36,9 +36,9 @@
  * Author: Liang Zhen <[email protected]>
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lnetst.h"
 #include "console.h"
 
 static int

drivers/staging/lustre/lnet/selftest/conrpc.c +2 -2

index 1be3cad..5a9a406 100644
@@ -36,8 +36,8 @@
  * Author: Liang Zhen <[email protected]>
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lib-lnet.h"
 #include "timer.h"
 #include "conrpc.h"
 #include "console.h"

drivers/staging/lustre/lnet/selftest/conrpc.h +4 -4

index 7ec6fc9..7004980e 100644
@@ -39,10 +39,10 @@
 #ifndef __LST_CONRPC_H__
 #define __LST_CONRPC_H__
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lnet.h"
-#include "../../include/linux/lnet/lib-types.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnet.h"
+#include "linux/lnet/lib-types.h"
+#include "linux/lnet/lnetst.h"
 #include "rpc.h"
 #include "selftest.h"

drivers/staging/lustre/lnet/selftest/console.c +2 -2

index 4c33621..4d4fcaf 100644
@@ -36,8 +36,8 @@
  * Author: Liang Zhen <[email protected]>
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lib-lnet.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lib-lnet.h"
 #include "console.h"
 #include "conrpc.h"

drivers/staging/lustre/lnet/selftest/console.h +4 -4

index 78b1477..669f7cd 100644
@@ -39,10 +39,10 @@
 #ifndef __LST_CONSOLE_H__
 #define __LST_CONSOLE_H__
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lnet.h"
-#include "../../include/linux/lnet/lib-types.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnet.h"
+#include "linux/lnet/lib-types.h"
+#include "linux/lnet/lnetst.h"
 #include "selftest.h"
 #include "conrpc.h"

drivers/staging/lustre/lnet/selftest/rpc.h +1 -1

index 4ab2ee2..c0653e4 100644
@@ -33,7 +33,7 @@
 #ifndef __SELFTEST_RPC_H__
 #define __SELFTEST_RPC_H__
 
-#include "../../include/linux/lnet/lnetst.h"
+#include "linux/lnet/lnetst.h"
 
 /*
  * LST wired structures

drivers/staging/lustre/lnet/selftest/selftest.h +5 -5

index d033ac0..f7958e8 100644
@@ -38,11 +38,11 @@
 
 #define LNET_ONLY
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/lnet.h"
-#include "../../include/linux/lnet/lib-lnet.h"
-#include "../../include/linux/lnet/lib-types.h"
-#include "../../include/linux/lnet/lnetst.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnet.h"
+#include "linux/lnet/lib-lnet.h"
+#include "linux/lnet/lib-types.h"
+#include "linux/lnet/lnetst.h"
 
 #include "rpc.h"
 #include "timer.h"

drivers/staging/lustre/lustre/fid/fid_internal.h +1 -1

index 5c53773..5753464 100644
@@ -37,7 +37,7 @@
 #define __FID_INTERNAL_H
 
 #include "../include/lustre/lustre_idl.h"
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 /* Functions used internally in module. */

drivers/staging/lustre/lustre/fid/fid_lib.c +1 -1

index 99ae7eb..d13777b 100644
@@ -39,7 +39,7 @@
 
 #define DEBUG_SUBSYSTEM S_FID
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/module.h>
 #include "../include/lustre/lustre_idl.h"
 #include "../include/lustre_fid.h"

drivers/staging/lustre/lustre/fid/fid_request.c +1 -1

index 454744d..46519b0 100644
@@ -38,7 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_FID
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/module.h>
 
 #include "../include/obd.h"

drivers/staging/lustre/lustre/fid/lproc_fid.c +1 -1

index 81b7ca9..e436b04 100644
@@ -38,7 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_FID
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/module.h>
 
 #include "../include/obd.h"

drivers/staging/lustre/lustre/fld/fld_cache.c +1 -1

index 0100a93..cc791ec 100644
@@ -39,7 +39,7 @@
 
 #define DEBUG_SUBSYSTEM S_FLD
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/module.h>
 #include <asm/div64.h>

drivers/staging/lustre/lustre/fld/fld_internal.h +1 -1

index f0efe5b..a0a9e1a 100644
@@ -39,7 +39,7 @@
 
 #include "../include/lustre/lustre_idl.h"
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/lustre_req_layout.h"
 #include "../include/lustre_fld.h"

drivers/staging/lustre/lustre/fld/fld_request.c +1 -1

index e59d626..1d7f4bd 100644
@@ -38,7 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_FLD
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/module.h>
 #include <asm/div64.h>

drivers/staging/lustre/lustre/fld/lproc_fld.c +1 -1

index 61ac420..c47cf0a 100644
@@ -39,7 +39,7 @@
 
 #define DEBUG_SUBSYSTEM S_FLD
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/module.h>
 
 #include "../include/obd.h"

drivers/staging/lustre/lustre/include/interval_tree.h +1 -1

index 4a15228..5559e3c 100644
@@ -36,7 +36,7 @@
 #ifndef _INTERVAL_H__
 #define _INTERVAL_H__
 
-#include "../../include/linux/libcfs/libcfs.h"	/* LASSERT. */
+#include "linux/libcfs/libcfs.h"	/* LASSERT. */
 
 struct interval_node {
 	struct interval_node   *in_left;

drivers/staging/lustre/lustre/include/linux/lustre_lite.h +1 -1

index d18e8a7..0ab8cf2 100644
@@ -45,7 +45,7 @@
 #include "../lustre_ha.h"
 
 #include <linux/rbtree.h>
-#include "../../include/linux/lustre_compat25.h"
+#include "linux/lustre_compat25.h"
 #include <linux/pagemap.h>
 
 /* lprocfs.c */

drivers/staging/lustre/lustre/include/lu_object.h +1 -1

index 6e25c1b..c4e117b 100644
@@ -34,7 +34,7 @@
 #define __LUSTRE_LU_OBJECT_H
 
 #include <stdarg.h>
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "lustre/lustre_idl.h"
 #include "lu_ref.h"

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +2 -2

index 051864c..27521e0 100644
@@ -87,8 +87,8 @@
 #ifndef _LUSTRE_IDL_H_
 #define _LUSTRE_IDL_H_
 
-#include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/lnet/types.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/types.h"
 
 /* Defn's shared with user-space. */
 #include "lustre_user.h"

drivers/staging/lustre/lustre/include/lustre_disk.h +2 -2

index 8886458..901abfe 100644
@@ -44,8 +44,8 @@
  * @{
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/types.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/types.h"
 #include <linux/backing-dev.h>
 
 /****************** persistent mount data *********************/

drivers/staging/lustre/lustre/include/lustre_fid.h +1 -1

index 743671a..1cdc5c4 100644
@@ -148,7 +148,7 @@
  *  Even so, the MDT and OST resources are also in different LDLM namespaces.
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "lustre/lustre_idl.h"
 
 struct lu_env;

drivers/staging/lustre/lustre/include/lustre_fld.h +1 -1

index 932410d..be5325b 100644
@@ -39,7 +39,7 @@
  */
 
 #include "lustre/lustre_idl.h"
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 struct lu_client_fld;
 struct lu_server_fld;

drivers/staging/lustre/lustre/include/lustre_handles.h +1 -1

index 1a63a6b..b76b073 100644
@@ -44,7 +44,7 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 struct portals_handle_ops {
 	void (*hop_addref)(void *object);

drivers/staging/lustre/lustre/include/lustre_lib.h +1 -1

index 06958f2..5ad534c 100644
@@ -45,7 +45,7 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/types.h>
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "lustre/lustre_idl.h"
 #include "lustre_ver.h"
 #include "lustre_cfg.h"

drivers/staging/lustre/lustre/include/lustre_mdc.h +1 -1

index fa62b95..cdeb3bc 100644
@@ -48,7 +48,7 @@
 #include <linux/dcache.h>
 #include "lustre_intent.h"
 #include "lustre_handles.h"
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "obd_class.h"
 #include "lustre/lustre_idl.h"
 #include "lustre_lib.h"

drivers/staging/lustre/lustre/include/lustre_mds.h +1 -1

index 4104bd9..5d4816d 100644
@@ -44,7 +44,7 @@
  */
 
 #include "lustre_handles.h"
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "lustre/lustre_idl.h"
 #include "lustre_lib.h"
 #include "lustre_dlm.h"

drivers/staging/lustre/lustre/include/lustre_net.h +3 -3

index d5debd6..320bcd2 100644
@@ -50,9 +50,9 @@
  * @{
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/lnet/nidstr.h"
-#include "../../include/linux/lnet/api.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/nidstr.h"
+#include "linux/lnet/api.h"
 #include "lustre/lustre_idl.h"
 #include "lustre_ha.h"
 #include "lustre_sec.h"

drivers/staging/lustre/lustre/include/obd_cksum.h +2 -2

index a8a81e6..1ba7ccc 100644
@@ -30,8 +30,8 @@
 
 #ifndef __OBD_CKSUM
 #define __OBD_CKSUM
-#include "../../include/linux/libcfs/libcfs.h"
-#include "../../include/linux/libcfs/libcfs_crypto.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs_crypto.h"
 #include "lustre/lustre_idl.h"
 
 static inline unsigned char cksum_obd2cfs(enum cksum_type cksum_type)

drivers/staging/lustre/lustre/include/obd_support.h +1 -1

index 845e64a..9d97d8c 100644
@@ -34,7 +34,7 @@
 #define _OBD_SUPPORT
 
 #include <linux/slab.h>
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "linux/lustre_compat25.h"
 #include "lprocfs_status.h"

drivers/staging/lustre/lustre/ldlm/l_lock.c +1 -1

index ea8840c..8271695 100644
@@ -31,7 +31,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/lustre_dlm.h"
 #include "../include/lustre_lib.h"

drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +1 -1

index f5023d9..c7c2c0e 100644
@@ -46,7 +46,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/lustre_dlm.h"
 #include "../include/obd_support.h"
 #include "../include/obd.h"

drivers/staging/lustre/lustre/ldlm/ldlm_lib.c +1 -1

index 7c832aa..20e2197 100644
@@ -39,7 +39,7 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/obd.h"
 #include "../include/obd_class.h"
 #include "../include/lustre_dlm.h"

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +1 -1

index a5993f7..f1c1ea0 100644
@@ -37,7 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/lustre_intent.h"
 #include "../include/obd_class.h"
 #include "ldlm_internal.h"

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +1 -1

index 821939f..3079729 100644
@@ -37,7 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/lustre_dlm.h"
 #include "../include/obd_class.h"
 #include <linux/list.h>

drivers/staging/lustre/lustre/llite/glimpse.c +1 -1

index 92004a0..6aa466a 100644
@@ -36,7 +36,7 @@
  *   Author: Oleg Drokin <[email protected]>
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/obd_class.h"
 #include "../include/obd_support.h"
 #include "../include/obd.h"

drivers/staging/lustre/lustre/llite/lcommon_cl.c +1 -1

index 396e4e4f..edc9e37 100644
@@ -37,7 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 # include <linux/fs.h>
 # include <linux/sched.h>
 # include <linux/mm.h>

drivers/staging/lustre/lustre/llite/llite_mmap.c +1 -1

index 66ee5db..eef6e18 100644
@@ -45,7 +45,7 @@
 
 #include "../include/lustre_lite.h"
 #include "llite_internal.h"
-#include "../include/linux/lustre_compat25.h"
+#include "linux/lustre_compat25.h"
 
 static const struct vm_operations_struct ll_file_vm_ops;

drivers/staging/lustre/lustre/llite/rw.c +1 -1

index 87393c4..721c37c 100644
@@ -53,7 +53,7 @@
 #include "../include/lustre_lite.h"
 #include "../include/obd_cksum.h"
 #include "llite_internal.h"
-#include "../include/linux/lustre_compat25.h"
+#include "linux/lustre_compat25.h"
 
 static void ll_ra_stats_inc_sbi(struct ll_sb_info *sbi, enum ra_stat which);

drivers/staging/lustre/lustre/llite/rw26.c +1 -1

index d98c7ac..9ac284b 100644
@@ -53,7 +53,7 @@
 
 #include "../include/lustre_lite.h"
 #include "llite_internal.h"
-#include "../include/linux/lustre_compat25.h"
+#include "linux/lustre_compat25.h"
 
 /**
  * Implements Linux VM address_space::invalidatepage() method. This method is

drivers/staging/lustre/lustre/llite/vvp_object.c +1 -1

index 2c520b0..97820fc 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
 #include "../include/lustre_lite.h"

drivers/staging/lustre/lustre/lov/lov_cl_internal.h +1 -1

index 9740568..3c77ae9 100644
@@ -42,7 +42,7 @@
 #ifndef LOV_CL_INTERNAL_H
 #define LOV_CL_INTERNAL_H
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
 #include "../include/cl_object.h"

drivers/staging/lustre/lustre/lov/lov_ea.c +1 -1

index 5053dea..4d9e506 100644
@@ -37,7 +37,7 @@
 #define DEBUG_SUBSYSTEM S_LOV
 
 #include <asm/div64.h>
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
 #include "../include/lustre/lustre_idl.h"

drivers/staging/lustre/lustre/lov/lov_merge.c +1 -1

index b9c9086..2a3e755 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
 #include "lov_internal.h"

drivers/staging/lustre/lustre/lov/lov_obd.c +1 -1

index 9b92d55..2bd3aba 100644
@@ -38,7 +38,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LOV
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_support.h"
 #include "../include/lustre_lib.h"

drivers/staging/lustre/lustre/lov/lov_offset.c +1 -1

index ecca74f..ab1f7e1 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"

drivers/staging/lustre/lustre/lov/lov_pool.c +1 -1

index 4c2d217..ddc257b 100644
@@ -40,7 +40,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
 #include "lov_internal.h"

drivers/staging/lustre/lustre/lov/lov_request.c +1 -1

index 4099b51..543f462 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
 #include "../include/lustre/lustre_idl.h"

drivers/staging/lustre/lustre/mgc/mgc_internal.h +1 -1

index f146f75..fbe1390 100644
@@ -33,7 +33,7 @@
 #ifndef _MGC_INTERNAL_H
 #define _MGC_INTERNAL_H
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/lustre/lustre_idl.h"
 #include "../include/lustre_lib.h"
 #include "../include/lustre_dlm.h"

drivers/staging/lustre/lustre/obdclass/cl_object.c +2 -2

index 91a5806..58dda55 100644
@@ -46,13 +46,13 @@
 
 #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 <linux/list.h>
-#include "../../include/linux/libcfs/libcfs_hash.h"	/* for cfs_hash stuff */
+#include "linux/libcfs/libcfs_hash.h"	/* for cfs_hash stuff */
 #include "../include/cl_object.h"
 #include "cl_internal.h"

drivers/staging/lustre/lustre/obdclass/cl_page.c +1 -1

index db2dc6b..01a87a2 100644
@@ -37,7 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/obd_class.h"
 #include "../include/obd_support.h"
 #include <linux/list.h>

drivers/staging/lustre/lustre/obdclass/class_obd.c +1 -1

index d9d2a19..a46c7d1 100644
@@ -35,7 +35,7 @@
 
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"
-#include "../../include/linux/lnet/lnetctl.h"
+#include "linux/lnet/lnetctl.h"
 #include "../include/lustre_debug.h"
 #include "../include/lprocfs_status.h"
 #include <linux/list.h>

drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +2 -2

index 33342bf..7f51e3b 100644
@@ -60,8 +60,8 @@
 #include <linux/seq_file.h>
 #include <linux/kobject.h>
 
-#include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/lnet/lnetctl.h"
+#include "linux/libcfs/libcfs.h"
+#include "linux/lnet/lnetctl.h"
 #include "../../include/obd_support.h"
 #include "../../include/obd_class.h"
 #include "../../include/lprocfs_status.h"

drivers/staging/lustre/lustre/obdclass/lu_object.c +2 -2

index 9b03059..2ac4914 100644
@@ -40,12 +40,12 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 # include <linux/module.h>
 
 /* hash_long() */
-#include "../../include/linux/libcfs/libcfs_hash.h"
+#include "linux/libcfs/libcfs_hash.h"
 #include "../include/obd_class.h"
 #include "../include/obd_support.h"
 #include "../include/lustre_disk.h"

drivers/staging/lustre/lustre/obdclass/lu_ref.c +1 -1

index e9f6040..e9d3a4e 100644
@@ -38,7 +38,7 @@
 
 #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"

drivers/staging/lustre/lustre/obdclass/obd_mount.c +1 -1

index aa84a50e..fed49a5 100644
@@ -41,7 +41,7 @@
 #define PRINT_CMD CDEBUG
 
 #include "../include/obd.h"
-#include "../include/linux/lustre_compat25.h"
+#include "linux/lustre_compat25.h"
 #include "../include/obd_class.h"
 #include "../include/lustre/lustre_user.h"
 #include "../include/lustre_log.h"

drivers/staging/lustre/lustre/obdclass/uuid.c +1 -1

index abd9b1a..6855352 100644
@@ -34,7 +34,7 @@
 
 #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"

drivers/staging/lustre/lustre/obdecho/echo_client.c +1 -1

index 5b29c4a..b21b6d3 100644
@@ -31,7 +31,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_ECHO
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
 #include "../include/obd_support.h"

drivers/staging/lustre/lustre/osc/osc_cl_internal.h +1 -1

index c8c3f1c..8a52e5f 100644
@@ -42,7 +42,7 @@
 #ifndef OSC_CL_INTERNAL_H
 #define OSC_CL_INTERNAL_H
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
 /* osc_build_res_name() */

drivers/staging/lustre/lustre/osc/osc_lock.c +1 -1

index 717d3ff..0b62bb9 100644
@@ -37,7 +37,7 @@
 
 #define DEBUG_SUBSYSTEM S_OSC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 /* fid_build_reg_res_name() */
 #include "../include/lustre_fid.h"

drivers/staging/lustre/lustre/osc/osc_request.c +1 -1

index 536b868..9976248 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_OSC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/lustre_dlm.h"
 #include "../include/lustre_net.h"

drivers/staging/lustre/lustre/ptlrpc/errno.c +1 -1

index 73f8374..6a5f4ce 100644
@@ -25,7 +25,7 @@
  * Copyright (c) 2013, Intel Corporation.
  */
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "../include/lustre/lustre_errno.h"
 
 /*

drivers/staging/lustre/lustre/ptlrpc/events.c +1 -1

index b1ce725..adf8903 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 # ifdef __mips64__
 #  include <linux/kernel.h>
 # endif

drivers/staging/lustre/lustre/ptlrpc/llog_client.c +1 -1

index 0f55c01..2b9232b 100644
@@ -38,7 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
 #include "../include/lustre_log.h"

drivers/staging/lustre/lustre/ptlrpc/llog_net.c +1 -1

index bccdace..89f6b18 100644
@@ -42,7 +42,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOG
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_class.h"
 #include "../include/lustre_log.h"

drivers/staging/lustre/lustre/ptlrpc/nrs.c +1 -1

index d88faf6..3c80881 100644
@@ -40,7 +40,7 @@
 #include "../include/obd_class.h"
 #include "../include/lustre_net.h"
 #include "../include/lprocfs_status.h"
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "ptlrpc_internal.h"
 
 /**

drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c +1 -1

index b123a93..0167bde 100644
@@ -45,7 +45,7 @@
 #define DEBUG_SUBSYSTEM S_RPC
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include "ptlrpc_internal.h"
 
 /**

drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +1 -1

index b514f18..740ff30 100644
@@ -40,7 +40,7 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"

drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c +1 -1

index 0a374b6..9f45ad5 100644
@@ -51,7 +51,7 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/lustre_net.h"
 #include "../include/lustre_lib.h"

drivers/staging/lustre/lustre/ptlrpc/recover.c +1 -1

index 718b3a8..78df690 100644
@@ -35,7 +35,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_support.h"
 #include "../include/lustre_ha.h"

drivers/staging/lustre/lustre/ptlrpc/sec.c +1 -1

index dbd819f..26d3695 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/crypto.h>
 #include <linux/key.h>

drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +1 -1

index 5f4d797..3b291d4 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
 #include "../include/obd_cksum.h"

drivers/staging/lustre/lustre/ptlrpc/sec_config.c +1 -1

index c140354..7d280dc 100644
@@ -32,7 +32,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/crypto.h>
 #include <linux/key.h>

drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +1 -1

index 9b9801e..e5ade1b 100644
@@ -36,7 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 
 #include "../include/obd_support.h"
 #include "../include/obd_class.h"

drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c +1 -1

index 07273f5..478c26b 100644
@@ -34,7 +34,7 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
-#include "../../include/linux/libcfs/libcfs.h"
+#include "linux/libcfs/libcfs.h"
 #include <linux/crypto.h>
 
 #include "../include/obd.h"

drivers/staging/lustre/lustre/ptlrpc/service.c +1 -1

index 4788c49..c1bde34 100644
@@ -35,7 +35,7 @@
 #include "../include/obd_class.h"
 #include "../include/lustre_net.h"
 #include "../include/lu_object.h"
-#include "../../include/linux/lnet/types.h"
+#include "linux/lnet/types.h"
 #include "ptlrpc_internal.h"
 
 /* The following are visible and mutable through /sys/module/ptlrpc */

Signature · 1 line

2.8.0.rc4.16.g56331f8