diff options
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/dir.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c index 85defeb64df..92969f879a1 100644 --- a/fs/dlm/dir.c +++ b/fs/dlm/dir.c | |||
@@ -374,7 +374,7 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen, | |||
374 | struct list_head *list; | 374 | struct list_head *list; |
375 | struct dlm_rsb *r; | 375 | struct dlm_rsb *r; |
376 | int offset = 0, dir_nodeid; | 376 | int offset = 0, dir_nodeid; |
377 | uint16_t be_namelen; | 377 | __be16 be_namelen; |
378 | 378 | ||
379 | down_read(&ls->ls_root_sem); | 379 | down_read(&ls->ls_root_sem); |
380 | 380 | ||
@@ -410,15 +410,15 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen, | |||
410 | 410 | ||
411 | if (offset + sizeof(uint16_t)*2 + r->res_length > outlen) { | 411 | if (offset + sizeof(uint16_t)*2 + r->res_length > outlen) { |
412 | /* Write end-of-block record */ | 412 | /* Write end-of-block record */ |
413 | be_namelen = 0; | 413 | be_namelen = cpu_to_be16(0); |
414 | memcpy(outbuf + offset, &be_namelen, sizeof(uint16_t)); | 414 | memcpy(outbuf + offset, &be_namelen, sizeof(__be16)); |
415 | offset += sizeof(uint16_t); | 415 | offset += sizeof(__be16); |
416 | goto out; | 416 | goto out; |
417 | } | 417 | } |
418 | 418 | ||
419 | be_namelen = cpu_to_be16(r->res_length); | 419 | be_namelen = cpu_to_be16(r->res_length); |
420 | memcpy(outbuf + offset, &be_namelen, sizeof(uint16_t)); | 420 | memcpy(outbuf + offset, &be_namelen, sizeof(__be16)); |
421 | offset += sizeof(uint16_t); | 421 | offset += sizeof(__be16); |
422 | memcpy(outbuf + offset, r->res_name, r->res_length); | 422 | memcpy(outbuf + offset, r->res_name, r->res_length); |
423 | offset += r->res_length; | 423 | offset += r->res_length; |
424 | } | 424 | } |
@@ -430,9 +430,9 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen, | |||
430 | 430 | ||
431 | if ((list == &ls->ls_root_list) && | 431 | if ((list == &ls->ls_root_list) && |
432 | (offset + sizeof(uint16_t) <= outlen)) { | 432 | (offset + sizeof(uint16_t) <= outlen)) { |
433 | be_namelen = 0xFFFF; | 433 | be_namelen = cpu_to_be16(0xFFFF); |
434 | memcpy(outbuf + offset, &be_namelen, sizeof(uint16_t)); | 434 | memcpy(outbuf + offset, &be_namelen, sizeof(__be16)); |
435 | offset += sizeof(uint16_t); | 435 | offset += sizeof(__be16); |
436 | } | 436 | } |
437 | 437 | ||
438 | out: | 438 | out: |