mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-26 18:43:33 -05:00
Code Activity

dlm: trivial annotation of be16 value

Browse source 
fs/dlm/dir.c:419:14: warning: incorrect type in assignment (different base types)
fs/dlm/dir.c:419:14:    expected unsigned short [unsigned] [addressable] [assigned] [usertype] be_namelen
fs/dlm/dir.c:419:14:    got restricted __be16 [usertype] <noident>

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Harvey Harrison 2008-11-12 16:28:43 -06:00 • committed by David Teigland
parent d6d7b702a3
commit cd8e4679bd
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/dlm/dir.c
View file

@ -374,7 +374,7 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen,
struct list_head *list; struct list_head *list;
struct dlm_rsb *r; struct dlm_rsb *r;
int offset = 0, dir_nodeid; int offset = 0, dir_nodeid;
uint16_t be_namelen; __be16 be_namelen;
down_read(&ls->ls_root_sem); down_read(&ls->ls_root_sem);
@ -410,15 +410,15 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen,
if (offset + sizeof(uint16_t)*2 + r->res_length > outlen) { if (offset + sizeof(uint16_t)*2 + r->res_length > outlen) {
/* Write end-of-block record */ /* Write end-of-block record */
be_namelen = 0; be_namelen = cpu_to_be16(0);
memcpy(outbuf + offset, &be_namelen, sizeof(uint16_t)); memcpy(outbuf + offset, &be_namelen, sizeof(__be16));
offset += sizeof(uint16_t); offset += sizeof(__be16);
goto out; goto out;
} }
be_namelen = cpu_to_be16(r->res_length); be_namelen = cpu_to_be16(r->res_length);
memcpy(outbuf + offset, &be_namelen, sizeof(uint16_t)); memcpy(outbuf + offset, &be_namelen, sizeof(__be16));
offset += sizeof(uint16_t); offset += sizeof(__be16);
memcpy(outbuf + offset, r->res_name, r->res_length); memcpy(outbuf + offset, r->res_name, r->res_length);
offset += r->res_length; offset += r->res_length;
} }
@ -430,9 +430,9 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen,
if ((list == &ls->ls_root_list) && if ((list == &ls->ls_root_list) &&
(offset + sizeof(uint16_t) <= outlen)) { (offset + sizeof(uint16_t) <= outlen)) {
be_namelen = 0xFFFF; be_namelen = cpu_to_be16(0xFFFF);
memcpy(outbuf + offset, &be_namelen, sizeof(uint16_t)); memcpy(outbuf + offset, &be_namelen, sizeof(__be16));
offset += sizeof(uint16_t); offset += sizeof(__be16);
} }
out: out: