X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fuapi%2Flinux%2Flustre%2Flustre_idl.h;h=23b13bd78afa4ff43196f78e2d3630ac7fa0fe13;hb=10da8afb278634a40be72f48dae42ce9755c62a0;hp=d8aa1867215046712c58b9e09c263c310f07aa69;hpb=b601f8997dd5c666d49fc2e2ea15196dfc917a2d;p=fs%2Flustre-release.git

diff --git a/lustre/include/uapi/linux/lustre/lustre_idl.h b/lustre/include/uapi/linux/lustre/lustre_idl.h
index d8aa186..23b13bd 100644
--- a/lustre/include/uapi/linux/lustre/lustre_idl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_idl.h
@@ -1174,7 +1174,8 @@ lov_mds_md_max_stripe_count(size_t buf_size, __u32 lmm_magic)
 #define OBD_MD_DOM_SIZE    (0X00001000ULL) /* Data-on-MDT component size */
 #define OBD_MD_FLNLINK     (0x00002000ULL) /* link count */
 #define OBD_MD_FLGENER     (0x00004000ULL) /* generation number */
-/*#define OBD_MD_FLINLINE    (0x00008000ULL)  inline data. used until 1.6.5 */
+#define OBD_MD_LAYOUT_VERSION (0x00008000ULL) /* layout version for
+					       * OST objects */
 #define OBD_MD_FLRDEV      (0x00010000ULL) /* device number */
 #define OBD_MD_FLEASIZE    (0x00020000ULL) /* extended attribute data */
 #define OBD_MD_LINKNAME    (0x00040000ULL) /* symbolic link target */
@@ -2683,7 +2684,7 @@ struct llog_setattr64_rec_v2 {
 	__u32			lsr_gid_h;
 	__u64			lsr_valid;
 	__u32			lsr_projid;
-	__u32			lsr_padding1;
+	__u32			lsr_layout_version;
 	__u64			lsr_padding2;
 	__u64			lsr_padding3;
 	struct llog_rec_tail	lsr_tail;
@@ -2922,7 +2923,7 @@ struct obdo {
 	 *
 	 * sizeof(ost_layout) + sieof(__u32) == sizeof(llog_cookie). */
 	struct ost_layout	o_layout;
-	__u32			o_padding_3;
+	__u32			o_layout_version;
 	__u32			o_uid_h;
 	__u32			o_gid_h;