Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dlm: linux/{dlm,dlm_device}.h: cleanup for userspace

Browse source 
linux/dlm_device.h uses types from dlm.h and types.h, so pull them in.  The
dlm.h header should use __u## rather than uint##_t types and thus pull in
linux/types.h for it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Mike Frysinger 2008-04-21 11:35:39 -05:00 committed by David Teigland
parent 3d564fa347
commit c1c76743e9
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/linux/dlm.h
View file

@ -21,6 +21,7 @@
/* Lock levels and flags are here */ /* Lock levels and flags are here */
#include <linux/dlmconstants.h> #include <linux/dlmconstants.h>
#include <linux/types.h>
typedef void dlm_lockspace_t; typedef void dlm_lockspace_t;
@ -59,7 +60,7 @@ typedef void dlm_lockspace_t;
struct dlm_lksb { struct dlm_lksb {
int sb_status; int sb_status;
uint32_t sb_lkid; __u32 sb_lkid;
char sb_flags; char sb_flags;
char * sb_lvbptr; char * sb_lvbptr;
}; };

8
include/linux/dlm_device.h
View file

@ -11,10 +11,16 @@
******************************************************************************* *******************************************************************************
******************************************************************************/ ******************************************************************************/
#ifndef _LINUX_DLM_DEVICE_H
#define _LINUX_DLM_DEVICE_H
/* This is the device interface for dlm, most users will use a library /* This is the device interface for dlm, most users will use a library
* interface. * interface.
*/ */
#include <linux/dlm.h>
#include <linux/types.h>
#define DLM_USER_LVB_LEN 32 #define DLM_USER_LVB_LEN 32
/* Version of the device interface */ /* Version of the device interface */
@ -98,3 +104,5 @@ struct dlm_lock_result {
#define DLM_USER_LSFLG_AUTOFREE 1 #define DLM_USER_LSFLG_AUTOFREE 1
#define DLM_USER_LSFLG_FORCEFREE 2 #define DLM_USER_LSFLG_FORCEFREE 2
#endif