dlm: trivial annotation of be16 value
PATCH 1/1 dlm: trivial annotation of be16 value
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_namelenfs/dlm/dir.c:419:14: got restricted __be16 [usertype] <noident>
Signed-off-by Harvey Harrison <[email protected]>
--- fs/dlm/dir.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
fs/dlm/dir.c +9 -9
@@ -374,7 +374,7 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen,struct list_head *list;struct dlm_rsb *r;int offset =0 , dir_nodeid; -uint16_t be_namelen; +__be16 be_namelen;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) {/* Write end-of-block record */ - be_namelen =0 ; -memcpy (outbuf + offset, &be_namelen,sizeof (uint16_t )); - offset +=sizeof (uint16_t ); + be_namelen =cpu_to_be16 (0 ); +memcpy (outbuf + offset, &be_namelen,sizeof (__be16)); + offset +=sizeof (__be16); goto out; } be_namelen =cpu_to_be16 (r->res_length); -memcpy (outbuf + offset, &be_namelen,sizeof (uint16_t )); - offset +=sizeof (uint16_t ); +memcpy (outbuf + offset, &be_namelen,sizeof (__be16)); + offset +=sizeof (__be16);memcpy (outbuf + offset, r->res_name, 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) && (offset +sizeof (uint16_t ) <= outlen)) { - be_namelen =0xFFFF ; -memcpy (outbuf + offset, &be_namelen,sizeof (uint16_t )); - offset +=sizeof (uint16_t ); + be_namelen =cpu_to_be16 (0xFFFF ); +memcpy (outbuf + offset, &be_namelen,sizeof (__be16)); + offset +=sizeof (__be16); } out:
Signature · 1 line
1.6.0.3.756.gb776d
David Teigland
maintainerQuoted 8 lines · Harvey Harrison
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_namelenfs/dlm/dir.c:419:14: got restricted__be16[usertype] <noident>Signed-off-by Harvey Harrison <[email protected]>--- fs/dlm/dir.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
Thanks, adding this to next branch.
Dave