diff options
| author |   John L. Hammond <john.hammond@intel.com> | 2016-09-18 16:38:41 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 10:03:41 +0200 |
| commit | 23ec6607e98bf78a864c5d3393aa07f4ece3ff3a (patch) | |
| tree | 3ac4eae79aeac9ef289d460784ef19696a5ecf2f /drivers/staging/lustre/lustre/llite/llite_internal.h | |
| parent | staging: lustre: libcfs: check mask returned by cpumask_of_node (diff) | |
| download | linux-dev-23ec6607e98bf78a864c5d3393aa07f4ece3ff3a.tar.xz linux-dev-23ec6607e98bf78a864c5d3393aa07f4ece3ff3a.zip | |
staging: lustre: remove lustre/include/linux/
Merge the contents of lustre/include/linux/lvfs.h into
lustre/include/lvfs.h. Merge lustre/include/linux/lustre_user.h into
lustre/include/lustre/lustre_user.h. Move lustre_compat25.h and
lustre_patchless_compat.h from lustre/include/linux/ to
lustre/include/ and rename lustre_compat25.h to lustre_compat.h.
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/13271
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Amir Shehata <amir.shehata@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/llite/llite_internal.h')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/llite_internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h index 05f2aa327c50..e5f196738785 100644 --- a/drivers/staging/lustre/lustre/llite/llite_internal.h +++ b/drivers/staging/lustre/lustre/llite/llite_internal.h @@ -39,11 +39,14 @@ #include "../include/lustre_linkea.h" /* for struct cl_lock_descr and struct cl_io */ +#include "../include/lustre_patchless_compat.h" +#include "../include/lustre_compat.h" #include "../include/cl_object.h" #include "../include/lustre_lmv.h" #include "../include/lustre_mdc.h" #include "../include/lustre_intent.h" #include <linux/compat.h> +#include <linux/namei.h> #include <linux/xattr.h> #include <linux/posix_acl_xattr.h> #include "vvp_internal.h" |