LU-2675 lustre: move lustre_intent.h to lustre/include

Move lustre_intent.h from lustre/include/linux to lustre/include.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I8b3947bc558e6721e4a238526497124d3ad193d0
Reviewed-on: http://review.whamcloud.com/11499
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>

diff --git a/lustre/include/Makefile.am b/lustre/include/Makefile.am
index c40cf4e..ba61f17 100644 (file)
--- a/lustre/include/Makefile.am
+++ b/lustre/include/Makefile.am
@@ -64,6 +64,7 @@ EXTRA_DIST = \
        lustre_handles.h \
        lustre_idmap.h \
        lustre_import.h \
+       lustre_intent.h \
        lustre_ioctl.h \
        lustre_lfsck.h \
        lustre_lib.h \

diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index d646b21..d3ff9a0 100644 (file)
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -45,4 +45,4 @@ endif
 EXTRA_DIST = lustre_lib.h \
        lustre_net.h obd_class.h obd_support.h \
        obd.h lvfs.h lustre_log.h lustre_compat25.h lustre_lite.h lustre_quota.h \
-       lustre_user.h lustre_patchless_compat.h lustre_intent.h
+       lustre_user.h lustre_patchless_compat.h

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index 2b78cec..fcb846e 100644 (file)
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -48,7 +48,6 @@
 #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>
 
 struct ll_iattr {
        struct iattr    iattr;

diff --git a/lustre/include/linux/lustre_intent.h b/lustre/include/lustre_intent.h
similarity index 100%
rename from lustre/include/linux/lustre_intent.h
rename to lustre/include/lustre_intent.h

diff --git a/lustre/include/lustre_mdc.h b/lustre/include/lustre_mdc.h
index 85f3f31..c99ab17 100644 (file)
--- a/lustre/include/lustre_mdc.h
+++ b/lustre/include/lustre_mdc.h
@@ -53,8 +53,8 @@
 #ifdef CONFIG_FS_POSIX_ACL
 # include <linux/posix_acl_xattr.h>
 #endif /* CONFIG_FS_POSIX_ACL */
-#include <linux/lustre_intent.h>
 #include <lustre_handles.h>
+#include <lustre_intent.h>
 #include <libcfs/libcfs.h>
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
@@ -192,9 +192,6 @@ static inline void mdc_update_max_ea_from_body(struct obd_export *exp,
 
 
 /* mdc/mdc_locks.c */
-int it_disposition(const struct lookup_intent *it, int flag);
-void it_clear_disposition(struct lookup_intent *it, int flag);
-void it_set_disposition(struct lookup_intent *it, int flag);
 int it_open_error(int phase, struct lookup_intent *it);
 #ifdef HAVE_SPLIT_SUPPORT
 int mdc_sendpage(struct obd_export *exp, const struct lu_fid *fid,

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 61f53be..9c0c680 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -50,6 +50,7 @@
 #include <lustre_export.h>
 #include <lustre_fid.h>
 #include <lustre_fld.h>
+#include <lustre_intent.h>
 #include <lustre_capa.h>
 #include <lvfs.h>
 

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 599666d..3e132b4 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -42,7 +42,6 @@
 #define DEBUG_SUBSYSTEM S_LDLM
 
 #include <libcfs/libcfs.h>
-#include <linux/lustre_intent.h>
 #include <obd_class.h>
 #include "ldlm_internal.h"
 

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 3c3def7..16dc8ef 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -46,7 +46,7 @@
 #include <lclient.h>
 #include <lustre_lmv.h>
 #include <lustre_mdc.h>
-#include <linux/lustre_intent.h>
+#include <lustre_intent.h>
 #include <linux/compat.h>
 
 #ifndef FMODE_EXEC

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 4bd0b3c..a1499b1 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -43,7 +43,7 @@
 #include <linux/math64.h>
 #include <linux/seq_file.h>
 #include <linux/namei.h>
-#include <linux/lustre_intent.h>
+#include <lustre_intent.h>
 
 #include <obd_support.h>
 #include <lustre/lustre_idl.h>

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 848048c..0cddc30 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -37,11 +37,11 @@
 #define DEBUG_SUBSYSTEM S_MDC
 
 #include <linux/module.h>
-#include <linux/lustre_intent.h>
 #include <obd.h>
 #include <obd_class.h>
 #include <lustre_dlm.h>
 #include <lustre_fid.h> /* fid_res_name_eq() */
+#include <lustre_intent.h>
 #include <lustre_mdc.h>
 #include <lustre_net.h>
 #include <lustre_req_layout.h>