LU-5319 ptlrpc: Add OBD_CONNECT_MULTIMODRPCS flag

[fs/lustre-release.git] / lustre / ptlrpc / pack_generic.c

diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 267574a..dcab780 100644 (file)
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -1670,6 +1670,9 @@ void lustre_swab_connect(struct obd_connect_data *ocd)
                 __swab32s(&ocd->ocd_max_easize);
         if (ocd->ocd_connect_flags & OBD_CONNECT_MAXBYTES)
                 __swab64s(&ocd->ocd_maxbytes);
+       if (ocd->ocd_connect_flags & OBD_CONNECT_MULTIMODRPCS)
+               __swab16s(&ocd->ocd_maxmodrpcs);
+       CLASSERT(offsetof(typeof(*ocd), padding0) != 0);
         CLASSERT(offsetof(typeof(*ocd), padding1) != 0);
         CLASSERT(offsetof(typeof(*ocd), padding2) != 0);
         CLASSERT(offsetof(typeof(*ocd), padding3) != 0);
@@ -2281,9 +2284,9 @@ void dump_rniobuf(struct niobuf_remote *nb)
 
 void dump_obdo(struct obdo *oa)
 {
-       __u32 valid = oa->o_valid;
+       u64 valid = oa->o_valid;
 
-       CDEBUG(D_RPCTRACE, "obdo: o_valid = %08x\n", valid);
+       CDEBUG(D_RPCTRACE, "obdo: o_valid = "LPX64"\n", valid);
        if (valid & OBD_MD_FLID)
                CDEBUG(D_RPCTRACE, "obdo: id = "DOSTID"\n", POSTID(&oa->o_oi));
        if (valid & OBD_MD_FLFID)