X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fpatches%2Fsuse-2.6.27.31%2Fpatches.suse%2Fdlm-trivial-annotation-of-be16-value.patch;fp=src%2Fpatches%2Fsuse-2.6.27.31%2Fpatches.suse%2Fdlm-trivial-annotation-of-be16-value.patch;h=0000000000000000000000000000000000000000;hb=2e4178199a697105e827d68d66ab7101acd1dd8c;hp=01c65a8dbe784c7e18b5ca01c376ace18b2a1ef3;hpb=df2a9a46c7db6362520343d6ec70fbcfe40b2795;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/src/patches/suse-2.6.27.31/patches.suse/dlm-trivial-annotation-of-be16-value.patch b/src/patches/suse-2.6.27.31/patches.suse/dlm-trivial-annotation-of-be16-value.patch deleted file mode 100644 index 01c65a8dbe..0000000000 --- a/src/patches/suse-2.6.27.31/patches.suse/dlm-trivial-annotation-of-be16-value.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Harvey Harrison -commit cd8e4679bdcf9b54564f2cda2389bd0f0457e12d -Author: Harvey Harrison -Date: Wed Nov 12 16:28:43 2008 -0600 -Subject: 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_namelen - fs/dlm/dir.c:419:14: got restricted __be16 [usertype] - -Signed-off-by: Harvey Harrison -Signed-off-by: David Teigland -Signed-off-by: Coly Li - -diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c -index 85defeb..92969f8 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, - 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: