Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=24097 move upcall_cache from lvfs to libcfs
[fs/lustre-release.git]
/
lustre
/
obdclass
/
llog_swab.c
diff --git
a/lustre/obdclass/llog_swab.c
b/lustre/obdclass/llog_swab.c
index
8c49fc7
..
18ebd29
100644
(file)
--- a/
lustre/obdclass/llog_swab.c
+++ b/
lustre/obdclass/llog_swab.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* 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.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-52,7
+52,7
@@
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, "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_o
gr: "LPX64"\n", d->lgd_logid.lgl_ogr
);
+ CDEBUG(D_OTHER, "\tlgd_logid.lgl_o
seq: "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);
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);
@@
-67,7
+67,7
@@
void lustre_swab_llogd_body (struct llogd_body *d)
ENTRY;
print_llogd_body(d);
__swab64s (&d->lgd_logid.lgl_oid);
ENTRY;
print_llogd_body(d);
__swab64s (&d->lgd_logid.lgl_oid);
- __swab64s (&d->lgd_logid.lgl_o
gr
);
+ __swab64s (&d->lgd_logid.lgl_o
seq
);
__swab32s (&d->lgd_logid.lgl_ogen);
__swab32s (&d->lgd_ctxt_idx);
__swab32s (&d->lgd_llh_flags);
__swab32s (&d->lgd_logid.lgl_ogen);
__swab32s (&d->lgd_ctxt_idx);
__swab32s (&d->lgd_llh_flags);
@@
-85,7
+85,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_gen.mnt_cnt);
__swab64s (&d->lgdc_gen.conn_cnt);
__swab64s (&d->lgdc_logid.lgl_oid);
- __swab64s (&d->lgdc_logid.lgl_o
gr
);
+ __swab64s (&d->lgdc_logid.lgl_o
seq
);
__swab32s (&d->lgdc_logid.lgl_ogen);
__swab32s (&d->lgdc_ctxt_idx);
}
__swab32s (&d->lgdc_logid.lgl_ogen);
__swab32s (&d->lgdc_ctxt_idx);
}
@@
-111,7
+111,8
@@
void lustre_swab_lu_seq_range(struct lu_seq_range *range)
{
__swab64s (&range->lsr_start);
__swab64s (&range->lsr_end);
{
__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);
}
EXPORT_SYMBOL(lustre_swab_lu_seq_range);
@@
-138,7
+139,7
@@
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);
struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec;
__swab64s(&lur->lur_oid);
- __swab32s(&lur->lur_o
gr
);
+ __swab32s(&lur->lur_o
seq
);
__swab32s(&lur->lur_count);
break;
}
__swab32s(&lur->lur_count);
break;
}
@@
-147,7
+148,7
@@
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);
struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec;
__swab64s(&lsr->lsr_oid);
- __swab32s(&lsr->lsr_o
gr
);
+ __swab32s(&lsr->lsr_o
seq
);
__swab32s(&lsr->lsr_uid);
__swab32s(&lsr->lsr_gid);
break;
__swab32s(&lsr->lsr_uid);
__swab32s(&lsr->lsr_gid);
break;
@@
-180,7
+181,7
@@
void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
__swab64s(&lsr->lsr_oid);
struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
__swab64s(&lsr->lsr_oid);
- __swab32s(&lsr->lsr_o
gr
);
+ __swab32s(&lsr->lsr_o
seq
);
__swab32s(&lsr->lsr_uid);
__swab32s(&lsr->lsr_gid);
__swab32s(&lsr->lsr_uid);
__swab32s(&lsr->lsr_gid);
@@
-211,11
+212,10
@@
void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
__swab64s(&lid->lid_id.lgl_oid);
struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
__swab64s(&lid->lid_id.lgl_oid);
- __swab64s(&lid->lid_id.lgl_o
gr
);
+ __swab64s(&lid->lid_id.lgl_o
seq
);
__swab32s(&lid->lid_id.lgl_ogen);
break;
}
__swab32s(&lid->lid_id.lgl_ogen);
break;
}
- case LLOG_JOIN_REC:
case LLOG_PAD_MAGIC:
break;
case LLOG_PAD_MAGIC:
break;