LU-6593 kernel: kernel update [RHEL7.1 3.10.0-229.4.2.el7]

[fs/lustre-release.git] / lustre / obdclass / obdo.c

diff --git a/lustre/obdclass/obdo.c b/lustre/obdclass/obdo.c
index 457dfc3..45cb2f4 100644 (file)
--- a/lustre/obdclass/obdo.c
+++ b/lustre/obdclass/obdo.c
@@ -42,6 +42,10 @@
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
 
@@ -149,8 +153,6 @@ void obdo_cpy_md(struct obdo *dst, const struct obdo *src, u64 valid)
                 dst->o_parent_oid = src->o_parent_oid;
         if (valid & OBD_MD_FLHANDLE)
                 dst->o_handle = src->o_handle;
-        if (valid & OBD_MD_FLCOOKIE)
-                dst->o_lcookie = src->o_lcookie;
 
         dst->o_valid |= valid;
 }