* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
{
CDEBUG(D_OTHER, "llogd body: %p\n", d);
CDEBUG(D_OTHER, "\tlgd_logid.lgl_oid: "LPX64"\n", d->lgd_logid.lgl_oid);
- CDEBUG(D_OTHER, "\tlgd_logid.lgl_ogr: "LPX64"\n", d->lgd_logid.lgl_ogr);
+ CDEBUG(D_OTHER, "\tlgd_logid.lgl_oseq: "LPX64"\n", d->lgd_logid.lgl_oseq);
CDEBUG(D_OTHER, "\tlgd_logid.lgl_ogen: %#x\n", d->lgd_logid.lgl_ogen);
CDEBUG(D_OTHER, "\tlgd_ctxt_idx: %#x\n", d->lgd_ctxt_idx);
CDEBUG(D_OTHER, "\tlgd_llh_flags: %#x\n", d->lgd_llh_flags);
ENTRY;
print_llogd_body(d);
__swab64s (&d->lgd_logid.lgl_oid);
- __swab64s (&d->lgd_logid.lgl_ogr);
+ __swab64s (&d->lgd_logid.lgl_oseq);
__swab32s (&d->lgd_logid.lgl_ogen);
__swab32s (&d->lgd_ctxt_idx);
__swab32s (&d->lgd_llh_flags);
__swab64s (&d->lgdc_gen.mnt_cnt);
__swab64s (&d->lgdc_gen.conn_cnt);
__swab64s (&d->lgdc_logid.lgl_oid);
- __swab64s (&d->lgdc_logid.lgl_ogr);
+ __swab64s (&d->lgdc_logid.lgl_oseq);
__swab32s (&d->lgdc_logid.lgl_ogen);
__swab32s (&d->lgdc_ctxt_idx);
}
}
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_index);
+ __swab32s (&range->lsr_flags);
}
-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)
{
lustre_swab_ll_fid(&lsc->lsc_fid);
__swab32s(&lsc->lsc_ioepoch);
-
break;
}
struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec;
__swab64s(&lur->lur_oid);
- __swab32s(&lur->lur_ogen);
-
+ __swab32s(&lur->lur_oseq);
+ __swab32s(&lur->lur_count);
break;
}
struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec;
__swab64s(&lsr->lsr_oid);
- __swab32s(&lsr->lsr_ogen);
+ __swab32s(&lsr->lsr_oseq);
+ __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_oseq);
__swab32s(&lsr->lsr_uid);
__swab32s(&lsr->lsr_gid);
}
case OBD_CFG_REC:
- case PTL_CFG_REC: /* obsolete */
/* these are swabbed as they are consumed */
break;
__swab32s(&llh->llh_tail.lrt_index);
__swab32s(&llh->llh_tail.lrt_len);
}
-
break;
}
struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
__swab64s(&lid->lid_id.lgl_oid);
- __swab64s(&lid->lid_id.lgl_ogr);
+ __swab64s(&lid->lid_id.lgl_oseq);
__swab32s(&lid->lid_id.lgl_ogen);
break;
}
-
case LLOG_PAD_MAGIC:
- /* ignore old pad records of type 0 */
- case 0:
break;
default:
return;
}
EXPORT_SYMBOL(lustre_swab_lustre_cfg);
+
+/* 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;
+
+ 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;
+}
+EXPORT_SYMBOL(lustre_swab_cfg_marker);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff