LU-1506 ldlm: correct lock res build for FID on OST

[fs/lustre-release.git] / lustre / include / obd.h

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index bfc40a8..3455924 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -110,8 +110,7 @@ struct lov_stripe_md {
         __u64            lsm_maxbytes;
         struct {
                 /* Public members. */
-                __u64 lw_object_id;        /* lov object id */
-                __u64 lw_object_seq;       /* lov object seq */
+               struct ost_id lw_object_oid; /* lov object id/seq */
 
                 /* LOV-private members start here -- only for use in lov/. */
                 __u32 lw_magic;
@@ -125,8 +124,9 @@ struct lov_stripe_md {
         struct lov_oinfo *lsm_oinfo[0];
 };
 
-#define lsm_object_id    lsm_wire.lw_object_id
-#define lsm_object_seq   lsm_wire.lw_object_seq
+#define lsm_object_oid  lsm_wire.lw_object_oid
+#define lsm_object_id    lsm_wire.lw_object_oid.oi_id
+#define lsm_object_seq   lsm_wire.lw_object_oid.oi_seq
 #define lsm_magic        lsm_wire.lw_magic
 #define lsm_layout_gen   lsm_wire.lw_layout_gen
 #define lsm_stripe_size  lsm_wire.lw_stripe_size