Commit ff8c39b2 authored by wang di's avatar wang di Committed by Greg Kroah-Hartman

staging/lustre/llog: Do not use ostid swab for llogid

Since logid still use id/seq format in the request,
it will be swabbed by its own swab func, instead of
using ostid swab, which might see logid as FID incorrectly.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3302
Lustre-change: http://review.whamcloud.com/6305Signed-off-by: default avatarwang di <di.wang@intel.com>
Reviewed-by: default avatarJohn Hammond <johnlockwoodhammond@gmail.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66cc83e9
...@@ -3268,6 +3268,7 @@ extern void lustre_swab_llogd_body (struct llogd_body *d); ...@@ -3268,6 +3268,7 @@ extern void lustre_swab_llogd_body (struct llogd_body *d);
extern void lustre_swab_llog_hdr (struct llog_log_hdr *h); extern void lustre_swab_llog_hdr (struct llog_log_hdr *h);
extern void lustre_swab_llogd_conn_body (struct llogd_conn_body *d); extern void lustre_swab_llogd_conn_body (struct llogd_conn_body *d);
extern void lustre_swab_llog_rec(struct llog_rec_hdr *rec); extern void lustre_swab_llog_rec(struct llog_rec_hdr *rec);
extern void lustre_swab_llog_id(struct llog_logid *lid);
struct lustre_cfg; struct lustre_cfg;
extern void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg); extern void lustre_swab_lustre_cfg(struct lustre_cfg *lcfg);
......
...@@ -78,12 +78,19 @@ void lustre_swab_ost_id(struct ost_id *oid) ...@@ -78,12 +78,19 @@ void lustre_swab_ost_id(struct ost_id *oid)
} }
EXPORT_SYMBOL(lustre_swab_ost_id); 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) void lustre_swab_llogd_body (struct llogd_body *d)
{ {
ENTRY; ENTRY;
print_llogd_body(d); print_llogd_body(d);
lustre_swab_ost_id(&d->lgd_logid.lgl_oi); lustre_swab_llog_id(&d->lgd_logid);
__swab32s (&d->lgd_logid.lgl_ogen);
__swab32s (&d->lgd_ctxt_idx); __swab32s (&d->lgd_ctxt_idx);
__swab32s (&d->lgd_llh_flags); __swab32s (&d->lgd_llh_flags);
__swab32s (&d->lgd_index); __swab32s (&d->lgd_index);
...@@ -99,8 +106,7 @@ void lustre_swab_llogd_conn_body (struct llogd_conn_body *d) ...@@ -99,8 +106,7 @@ void lustre_swab_llogd_conn_body (struct llogd_conn_body *d)
{ {
__swab64s (&d->lgdc_gen.mnt_cnt); __swab64s (&d->lgdc_gen.mnt_cnt);
__swab64s (&d->lgdc_gen.conn_cnt); __swab64s (&d->lgdc_gen.conn_cnt);
lustre_swab_ost_id(&d->lgdc_logid.lgl_oi); lustre_swab_llog_id(&d->lgdc_logid);
__swab32s (&d->lgdc_logid.lgl_ogen);
__swab32s (&d->lgdc_ctxt_idx); __swab32s (&d->lgdc_ctxt_idx);
} }
EXPORT_SYMBOL(lustre_swab_llogd_conn_body); EXPORT_SYMBOL(lustre_swab_llogd_conn_body);
...@@ -230,8 +236,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec) ...@@ -230,8 +236,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
{ {
struct llog_logid_rec *lid = (struct llog_logid_rec *)rec; struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
lustre_swab_ost_id(&lid->lid_id.lgl_oi); lustre_swab_llog_id(&lid->lid_id);
__swab32s(&lid->lid_id.lgl_ogen);
tail = &lid->lid_tail; tail = &lid->lid_tail;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment