Commit 6af86528 authored by Dan Carpenter's avatar Dan Carpenter Committed by Sage Weil

ceph: tidy ceph_mdsmap_decode() a little

I introduced a new temporary variable "info" instead of
"m->m_info[mds]".  Also I reversed the if condition and pulled
everything in one indent level.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent c213b50b
...@@ -92,6 +92,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) ...@@ -92,6 +92,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
u32 num_export_targets; u32 num_export_targets;
void *pexport_targets = NULL; void *pexport_targets = NULL;
struct ceph_timespec laggy_since; struct ceph_timespec laggy_since;
struct ceph_mds_info *info;
ceph_decode_need(p, end, sizeof(u64)*2 + 1 + sizeof(u32), bad); ceph_decode_need(p, end, sizeof(u64)*2 + 1 + sizeof(u32), bad);
global_id = ceph_decode_64(p); global_id = ceph_decode_64(p);
...@@ -126,26 +127,27 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) ...@@ -126,26 +127,27 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
i+1, n, global_id, mds, inc, i+1, n, global_id, mds, inc,
ceph_pr_addr(&addr.in_addr), ceph_pr_addr(&addr.in_addr),
ceph_mds_state_name(state)); ceph_mds_state_name(state));
if (mds >= 0 && mds < m->m_max_mds && state > 0) {
m->m_info[mds].global_id = global_id; if (mds < 0 || mds >= m->m_max_mds || state <= 0)
m->m_info[mds].state = state; continue;
m->m_info[mds].addr = addr;
m->m_info[mds].laggy = info = &m->m_info[mds];
(laggy_since.tv_sec != 0 || info->global_id = global_id;
laggy_since.tv_nsec != 0); info->state = state;
m->m_info[mds].num_export_targets = num_export_targets; info->addr = addr;
if (num_export_targets) { info->laggy = (laggy_since.tv_sec != 0 ||
m->m_info[mds].export_targets = laggy_since.tv_nsec != 0);
kcalloc(num_export_targets, sizeof(u32), info->num_export_targets = num_export_targets;
GFP_NOFS); if (num_export_targets) {
if (m->m_info[mds].export_targets == NULL) info->export_targets = kcalloc(num_export_targets,
goto badmem; sizeof(u32), GFP_NOFS);
for (j = 0; j < num_export_targets; j++) if (info->export_targets == NULL)
m->m_info[mds].export_targets[j] = goto badmem;
ceph_decode_32(&pexport_targets); for (j = 0; j < num_export_targets; j++)
} else { info->export_targets[j] =
m->m_info[mds].export_targets = NULL; ceph_decode_32(&pexport_targets);
} } else {
info->export_targets = NULL;
} }
} }
......
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