X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_object.c;h=e7e4480ee541ae2849077f14f2d49a1dd3fafc30;hb=fb36d989168ea1794c8c0abb387982f857ed647f;hp=9e723e2974fa3f9d943baf51b7f7191d075660b6;hpb=d5d5b349f23e769ae4c6307a295c532856af9c21;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 9e723e2..e7e4480 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -40,7 +40,10 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-
+#include <linux/user_namespace.h>
+#ifdef HAVE_UIDGID_HEADER
+# include <linux/uidgid.h>
+#endif
 #include <libcfs/libcfs.h>
 
 #include <obd.h>
@@ -137,7 +140,7 @@ static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
 		CDEBUG(D_VFSTRACE, DFID ": losing layout lock\n",
 		       PFID(&lli->lli_fid));
 
-		ll_layout_version_set(lli, LL_LAYOUT_GEN_NONE);
+		ll_layout_version_set(lli, CL_LAYOUT_GEN_NONE);
 
 		/* Clean up page mmap for this inode.
 		 * The reason for us to do this is that if the page has