diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmdebug.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmdebug.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/ocfs2/dlm/dlmdebug.c b/fs/ocfs2/dlm/dlmdebug.c index bf9fa270ee98..bdf1c7817bb5 100644 --- a/fs/ocfs2/dlm/dlmdebug.c +++ b/fs/ocfs2/dlm/dlmdebug.c | |||
@@ -287,18 +287,8 @@ static int stringify_nodemap(unsigned long *nodemap, int maxnodes, | |||
287 | static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len) | 287 | static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len) |
288 | { | 288 | { |
289 | int out = 0; | 289 | int out = 0; |
290 | unsigned int namelen; | ||
291 | unsigned char *name; | ||
292 | char *mle_type; | 290 | char *mle_type; |
293 | 291 | ||
294 | if (mle->type != DLM_MLE_MASTER) { | ||
295 | name = mle->u.mlename.name; | ||
296 | namelen = mle->u.mlename.len; | ||
297 | } else { | ||
298 | name = (unsigned char *)mle->u.mleres->lockname.name; | ||
299 | namelen = mle->u.mleres->lockname.len; | ||
300 | } | ||
301 | |||
302 | if (mle->type == DLM_MLE_BLOCK) | 292 | if (mle->type == DLM_MLE_BLOCK) |
303 | mle_type = "BLK"; | 293 | mle_type = "BLK"; |
304 | else if (mle->type == DLM_MLE_MASTER) | 294 | else if (mle->type == DLM_MLE_MASTER) |
@@ -306,7 +296,7 @@ static int dump_mle(struct dlm_master_list_entry *mle, char *buf, int len) | |||
306 | else | 296 | else |
307 | mle_type = "MIG"; | 297 | mle_type = "MIG"; |
308 | 298 | ||
309 | out += stringify_lockname(name, namelen, buf + out, len - out); | 299 | out += stringify_lockname(mle->mname, mle->mnamelen, buf + out, len - out); |
310 | out += snprintf(buf + out, len - out, | 300 | out += snprintf(buf + out, len - out, |
311 | "\t%3s\tmas=%3u\tnew=%3u\tevt=%1d\tuse=%1d\tref=%3d\n", | 301 | "\t%3s\tmas=%3u\tnew=%3u\tevt=%1d\tuse=%1d\tref=%3d\n", |
312 | mle_type, mle->master, mle->new_master, | 302 | mle_type, mle->master, mle->new_master, |