X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_swab.c;h=41ee78a4b628e43072cdd129f57a30b482182808;hb=1072318b4d89cddba00e9adeb939249f485f2d13;hp=e2ad1adfcbf43193a086203a272c332e3a213c92;hpb=c7342f2d57745fe020d87012be52354d48a1bf7e;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c index e2ad1ad..41ee78a 100644 --- a/lustre/obdclass/llog_swab.c +++ b/lustre/obdclass/llog_swab.c @@ -107,12 +107,13 @@ void lustre_swab_lu_fid(struct lu_fid *fid) } EXPORT_SYMBOL(lustre_swab_lu_fid); -void lustre_swab_lu_range(struct lu_range *range) +void lustre_swab_lu_seq_range(struct lu_seq_range *range) { - __swab64s (&range->lr_start); - __swab64s (&range->lr_end); + __swab64s (&range->lsr_start); + __swab64s (&range->lsr_end); + __swab32s (&range->lsr_mdt); } -EXPORT_SYMBOL(lustre_swab_lu_range); +EXPORT_SYMBOL(lustre_swab_lu_seq_range); void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) { @@ -127,7 +128,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) lustre_swab_ll_fid(&lsc->lsc_fid); __swab32s(&lsc->lsc_ioepoch); - break; } @@ -138,8 +138,8 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec; __swab64s(&lur->lur_oid); - __swab32s(&lur->lur_ogen); - + __swab32s(&lur->lur_ogr); + __swab32s(&lur->lur_count); break; } @@ -147,7 +147,40 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec; __swab64s(&lsr->lsr_oid); - __swab32s(&lsr->lsr_ogen); + __swab32s(&lsr->lsr_ogr); + __swab32s(&lsr->lsr_uid); + __swab32s(&lsr->lsr_gid); + break; + } + + case CHANGELOG_REC: { + struct llog_changelog_rec *cr = (struct llog_changelog_rec*)rec; + + __swab16s(&cr->cr.cr_namelen); + __swab16s(&cr->cr.cr_flags); + __swab32s(&cr->cr.cr_type); + __swab64s(&cr->cr.cr_index); + __swab64s(&cr->cr.cr_prev); + __swab64s(&cr->cr.cr_time); + lustre_swab_lu_fid(&cr->cr.cr_tfid); + lustre_swab_lu_fid(&cr->cr.cr_pfid); + break; + } + + case CHANGELOG_USER_REC: { + struct llog_changelog_user_rec *cur = + (struct llog_changelog_user_rec*)rec; + + __swab32s(&cur->cur_id); + __swab64s(&cur->cur_endrec); + break; + } + + case MDS_SETATTR64_REC: { + struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec; + + __swab64s(&lsr->lsr_oid); + __swab32s(&lsr->lsr_ogr); __swab32s(&lsr->lsr_uid); __swab32s(&lsr->lsr_gid); @@ -155,7 +188,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) } case OBD_CFG_REC: - case PTL_CFG_REC: /* obsolete */ /* these are swabbed as they are consumed */ break; @@ -172,7 +204,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) __swab32s(&llh->llh_tail.lrt_index); __swab32s(&llh->llh_tail.lrt_len); } - break; } @@ -184,10 +215,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) __swab32s(&lid->lid_id.lgl_ogen); break; } - case LLOG_JOIN_REC: case LLOG_PAD_MAGIC: - /* ignore old pad records of type 0 */ - case 0: break; default: @@ -281,13 +309,64 @@ void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg) } EXPORT_SYMBOL(lustre_swab_lustre_cfg); -void lustre_swab_cfg_marker(struct cfg_marker *marker) +/* used only for compatibility with old on-disk cfg_marker data */ +struct cfg_marker32 { + __u32 cm_step; + __u32 cm_flags; + __u32 cm_vers; + __u32 padding; + __u32 cm_createtime; + __u32 cm_canceltime; + char cm_tgtname[MTI_NAME_MAXLEN]; + char cm_comment[MTI_NAME_MAXLEN]; +}; + +#define MTI_NAMELEN32 (MTI_NAME_MAXLEN - \ + (sizeof(struct cfg_marker) - sizeof(struct cfg_marker32))) + +void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size) { + struct cfg_marker32 *cm32 = (struct cfg_marker32*)marker; ENTRY; - __swab32s(&marker->cm_step); - __swab32s(&marker->cm_flags); - __swab32s(&marker->cm_vers); + if (swab) { + __swab32s(&marker->cm_step); + __swab32s(&marker->cm_flags); + __swab32s(&marker->cm_vers); + } + if (size == sizeof(*cm32)) { + __u32 createtime, canceltime; + /* There was a problem with the original declaration of + * cfg_marker on 32-bit systems because it used time_t as + * a wire protocol structure, and didn't verify this in + * wirecheck. We now have to convert the offsets of the + * later fields in order to work on 32- and 64-bit systems. + * + * Fortunately, the cm_comment field has no functional use + * so can be sacrificed when converting the timestamp size. + * + * Overwrite fields from the end first, so they are not + * clobbered, and use memmove() instead of memcpy() because + * the source and target buffers overlap. bug 16771 */ + createtime = cm32->cm_createtime; + canceltime = cm32->cm_canceltime; + memmove(marker->cm_comment, cm32->cm_comment, MTI_NAMELEN32); + marker->cm_comment[MTI_NAMELEN32 - 1] = '\0'; + memmove(marker->cm_tgtname, cm32->cm_tgtname, + sizeof(marker->cm_tgtname)); + if (swab) { + __swab32s(&createtime); + __swab32s(&canceltime); + } + marker->cm_createtime = createtime; + marker->cm_canceltime = canceltime; + CDEBUG(D_CONFIG, "Find old cfg_marker(Srv32b,Clt64b) " + "for target %s, converting\n", + marker->cm_tgtname); + } else if (swab) { + __swab64s(&marker->cm_createtime); + __swab64s(&marker->cm_canceltime); + } EXIT; return;