X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_swab.c;h=150921a39352d3d2e70f547beb7542b586bff1d5;hp=294798918dac143e4cee6e5a9e7a523952f53324;hb=c394068ee148595711c661651368b91373bcc78a;hpb=0a859380c36ac24871f221b35042f76c56b04438 diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c index 2947989..150921a 100644 --- a/lustre/obdclass/llog_swab.c +++ b/lustre/obdclass/llog_swab.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * 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. + * + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -51,8 +51,8 @@ static void print_llogd_body(struct llogd_body *d) { 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_oseq: "LPX64"\n", d->lgd_logid.lgl_oseq); + CDEBUG(D_OTHER, "\tlgd_logid.lgl_oi: "DOSTID"\n", + POSTID(&d->lgd_logid.lgl_oi)); 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); @@ -62,13 +62,39 @@ static void print_llogd_body(struct llogd_body *d) CDEBUG(D_OTHER, "\tlgd_cur_offset: "LPX64"\n", d->lgd_cur_offset); } +void lustre_swab_lu_fid(struct lu_fid *fid) +{ + __swab64s (&fid->f_seq); + __swab32s (&fid->f_oid); + __swab32s (&fid->f_ver); +} +EXPORT_SYMBOL(lustre_swab_lu_fid); + +void lustre_swab_ost_id(struct ost_id *oid) +{ + if (fid_seq_is_mdt0(oid->oi.oi_seq) || + fid_seq_is_default(oid->oi.oi_seq)) { + __swab64s(&oid->oi.oi_id); + __swab64s(&oid->oi.oi_seq); + } else { + lustre_swab_lu_fid(&oid->oi_fid); + } +} +EXPORT_SYMBOL(lustre_swab_ost_id); + +void lustre_swab_llog_id(struct llog_logid *log_id) +{ + __swab64s(&log_id->lgl_oi.oi.oi_id); + __swab64s(&log_id->lgl_oi.oi.oi_seq); + __swab32s(&log_id->lgl_ogen); +} +EXPORT_SYMBOL(lustre_swab_llog_id); + void lustre_swab_llogd_body (struct llogd_body *d) { ENTRY; print_llogd_body(d); - __swab64s (&d->lgd_logid.lgl_oid); - __swab64s (&d->lgd_logid.lgl_oseq); - __swab32s (&d->lgd_logid.lgl_ogen); + lustre_swab_llog_id(&d->lgd_logid); __swab32s (&d->lgd_ctxt_idx); __swab32s (&d->lgd_llh_flags); __swab32s (&d->lgd_index); @@ -84,9 +110,7 @@ void lustre_swab_llogd_conn_body (struct llogd_conn_body *d) { __swab64s (&d->lgdc_gen.mnt_cnt); __swab64s (&d->lgdc_gen.conn_cnt); - __swab64s (&d->lgdc_logid.lgl_oid); - __swab64s (&d->lgdc_logid.lgl_oseq); - __swab32s (&d->lgdc_logid.lgl_ogen); + lustre_swab_llog_id(&d->lgdc_logid); __swab32s (&d->lgdc_ctxt_idx); } EXPORT_SYMBOL(lustre_swab_llogd_conn_body); @@ -99,61 +123,57 @@ void lustre_swab_ll_fid(struct ll_fid *fid) } EXPORT_SYMBOL(lustre_swab_ll_fid); -void lustre_swab_lu_fid(struct lu_fid *fid) -{ - __swab64s (&fid->f_seq); - __swab32s (&fid->f_oid); - __swab32s (&fid->f_ver); -} -EXPORT_SYMBOL(lustre_swab_lu_fid); - void lustre_swab_lu_seq_range(struct lu_seq_range *range) { __swab64s (&range->lsr_start); __swab64s (&range->lsr_end); - __swab32s (&range->lsr_mdt); + __swab32s (&range->lsr_index); + __swab32s (&range->lsr_flags); } EXPORT_SYMBOL(lustre_swab_lu_seq_range); -void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) +void lustre_swab_llog_rec(struct llog_rec_hdr *rec) { + struct llog_rec_tail *tail = NULL; + __swab32s(&rec->lrh_len); __swab32s(&rec->lrh_index); __swab32s(&rec->lrh_type); + __swab32s(&rec->lrh_id); switch (rec->lrh_type) { - case OST_SZ_REC: { + case OST_SZ_REC: + { struct llog_size_change_rec *lsc = (struct llog_size_change_rec *)rec; lustre_swab_ll_fid(&lsc->lsc_fid); __swab32s(&lsc->lsc_ioepoch); + tail = &lsc->lsc_tail; break; } - - case OST_RAID1_REC: - break; - - case MDS_UNLINK_REC: { + case MDS_UNLINK_REC: + { struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec; __swab64s(&lur->lur_oid); __swab32s(&lur->lur_oseq); __swab32s(&lur->lur_count); + tail = &lur->lur_tail; break; } - - case MDS_SETATTR_REC: { - struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec; - - __swab64s(&lsr->lsr_oid); - __swab32s(&lsr->lsr_oseq); - __swab32s(&lsr->lsr_uid); - __swab32s(&lsr->lsr_gid); - break; - } - - case CHANGELOG_REC: { + case MDS_UNLINK64_REC: + { + struct llog_unlink64_rec *lur = + (struct llog_unlink64_rec *)rec; + + lustre_swab_lu_fid(&lur->lur_fid); + __swab32s(&lur->lur_count); + tail = &lur->lur_tail; + break; + } + case CHANGELOG_REC: + { struct llog_changelog_rec *cr = (struct llog_changelog_rec*)rec; __swab16s(&cr->cr.cr_namelen); @@ -164,34 +184,65 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) __swab64s(&cr->cr.cr_time); lustre_swab_lu_fid(&cr->cr.cr_tfid); lustre_swab_lu_fid(&cr->cr.cr_pfid); + if (CHANGELOG_REC_EXTENDED(&cr->cr)) { + struct llog_changelog_ext_rec *ext = + (struct llog_changelog_ext_rec *)rec; + + lustre_swab_lu_fid(&ext->cr.cr_sfid); + lustre_swab_lu_fid(&ext->cr.cr_spfid); + tail = &ext->cr_tail; + } else { + tail = &cr->cr_tail; + } break; } - - case CHANGELOG_USER_REC: { + case CHANGELOG_USER_REC: + { struct llog_changelog_user_rec *cur = (struct llog_changelog_user_rec*)rec; __swab32s(&cur->cur_id); __swab64s(&cur->cur_endrec); + tail = &cur->cur_tail; 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); - - break; + case HSM_AGENT_REC: { + struct llog_agent_req_rec *arr = + (struct llog_agent_req_rec *)rec; + + __swab32s(&arr->arr_hai.hai_len); + __swab32s(&arr->arr_hai.hai_action); + lustre_swab_lu_fid(&arr->arr_hai.hai_fid); + lustre_swab_lu_fid(&arr->arr_hai.hai_dfid); + __swab64s(&arr->arr_hai.hai_cookie); + __swab64s(&arr->arr_hai.hai_extent.offset); + __swab64s(&arr->arr_hai.hai_extent.length); + __swab64s(&arr->arr_hai.hai_gid); + /* no swabing for opaque data */ + /* hai_data[0]; */ + break; + } + + case MDS_SETATTR64_REC: + { + struct llog_setattr64_rec *lsr = + (struct llog_setattr64_rec *)rec; + + lustre_swab_ost_id(&lsr->lsr_oi); + __swab32s(&lsr->lsr_uid); + __swab32s(&lsr->lsr_uid_h); + __swab32s(&lsr->lsr_gid); + __swab32s(&lsr->lsr_gid_h); + __swab64s(&lsr->lsr_valid); + tail = &lsr->lsr_tail; + break; } - case OBD_CFG_REC: /* these are swabbed as they are consumed */ break; - - case LLOG_HDR_MAGIC: { + case LLOG_HDR_MAGIC: + { struct llog_log_hdr *llh = (struct llog_log_hdr *)rec; __swab64s(&llh->llh_timestamp); @@ -200,24 +251,28 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail) __swab32s(&llh->llh_flags); __swab32s(&llh->llh_size); __swab32s(&llh->llh_cat_idx); - if (tail != &llh->llh_tail) { - __swab32s(&llh->llh_tail.lrt_index); - __swab32s(&llh->llh_tail.lrt_len); - } - break; - } - - case LLOG_LOGID_MAGIC: { - struct llog_logid_rec *lid = (struct llog_logid_rec *)rec; - - __swab64s(&lid->lid_id.lgl_oid); - __swab64s(&lid->lid_id.lgl_oseq); - __swab32s(&lid->lid_id.lgl_ogen); + tail = &llh->llh_tail; break; } + case LLOG_LOGID_MAGIC: + { + struct llog_logid_rec *lid = (struct llog_logid_rec *)rec; + + lustre_swab_llog_id(&lid->lid_id); + tail = &lid->lid_tail; + break; + } + case LLOG_GEN_REC: + { + struct llog_gen_rec *lgr = (struct llog_gen_rec *)rec; + + __swab64s(&lgr->lgr_gen.mnt_cnt); + __swab64s(&lgr->lgr_gen.conn_cnt); + tail = &lgr->lgr_tail; + break; + } case LLOG_PAD_MAGIC: break; - default: CERROR("Unknown llog rec type %#x swabbing rec %p\n", rec->lrh_type, rec); @@ -251,7 +306,7 @@ void lustre_swab_llog_hdr (struct llog_log_hdr *h) ENTRY; print_llog_hdr(h); - lustre_swab_llog_rec(&h->llh_hdr, &h->llh_tail); + lustre_swab_llog_rec(&h->llh_hdr); print_llog_hdr(h); EXIT;