Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / dlm-trivial-annotation-of-be16-value.patch

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 (file)
index 01c65a8..0000000
--- 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 <harvey.harrison@gmail.com>
-commit cd8e4679bdcf9b54564f2cda2389bd0f0457e12d
-Author: Harvey Harrison <harvey.harrison@gmail.com>
-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] <noident>
-    
-Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
-Signed-off-by: David Teigland <teigland@redhat.com>
-Signed-off-by: Coly Li <coly.li@suse.de>
-
-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: