src/patches/suse-2.6.27.25/patches.suse/dlm_lock_data-make-most-exported-headers-use-strict-integer-types.patch

   1 From: Coly Li <coly.li@suse.de>
   2 Author: Arnd Bergmann <arnd@arndb.de>
   3 Date:   Thu Feb 26 00:51:40 2009 +0100
   4 Subject: make most exported headers use strict integer types
   5
   6     This takes care of all files that have only a small number
   7     of non-strict integer type uses.
   8
   9     Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  10     Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
  11     Cc: David Airlie <airlied@linux.ie>
  12     Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  13     Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
  14     Cc: netdev@vger.kernel.org
  15     Cc: linux-ppp@vger.kernel.org
  16     Cc: Jaroslav Kysela <perex@perex.cz>
  17     Cc: Takashi Iwai <tiwai@suse.de>
  18     Cc: David Woodhouse <dwmw2@infradead.org>
  19     Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  20     Signed-off-by: Ingo Molnar <mingo@elte.hu>
  21
  22     This patch is part of commit 9adfbfb611307060db54691bc7e6d53fdc12312b.
  23     The original patch touches too many files which are unnecessary for dlm
  24     fix, therefore I only the dlm related part.
  25
  26     Signed-off-by: Coly Li <coly.li@suse.de>
  27
  28 diff --git a/include/linux/dlm_netlink.h b/include/linux/dlm_netlink.h
  29 index 1927633..647c8ef 100644
  30 --- a/include/linux/dlm_netlink.h
  31 +++ b/include/linux/dlm_netlink.h
  32 @@ -9,6 +9,8 @@
  33  #ifndef _DLM_NETLINK_H
  34  #define _DLM_NETLINK_H
  35
  36 +#include <linux/types.h>
  37 +
  38  enum {
  39         DLM_STATUS_WAITING = 1,
  40         DLM_STATUS_GRANTED = 2,
  41 @@ -18,16 +20,16 @@ enum {
  42  #define DLM_LOCK_DATA_VERSION 1
  43
  44  struct dlm_lock_data {
  45 -       uint16_t version;
  46 -       uint32_t lockspace_id;
  47 +       __u16 version;
  48 +       __u32 lockspace_id;
  49         int nodeid;
  50         int ownpid;
  51 -       uint32_t id;
  52 -       uint32_t remid;
  53 -       uint64_t xid;
  54 -       int8_t status;
  55 -       int8_t grmode;
  56 -       int8_t rqmode;
  57 +       __u32 id;
  58 +       __u32 remid;
  59 +       __u64 xid;
  60 +       __s8 status;
  61 +       __s8 grmode;
  62 +       __s8 rqmode;
  63         unsigned long timestamp;
  64         int resource_namelen;
  65         char resource_name[DLM_RESNAME_MAXLEN];