X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Flibcfs.h;h=343ef86ced53306218855da6f766ad266142b5b2;hb=c4a6999ceec8ac95415de4cb6099182d3f67d1cb;hp=34c36a30394adec993331ffa3aaf0ac870ea3983;hpb=c8fd9c3c38a66ab3dd479c48e0168577a4ff960e;p=fs%2Flustre-release.git diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h index 34c36a3..343ef86 100644 --- a/libcfs/include/libcfs/libcfs.h +++ b/libcfs/include/libcfs/libcfs.h @@ -37,21 +37,13 @@ #ifndef __LIBCFS_LIBCFS_H__ #define __LIBCFS_LIBCFS_H__ -#if !__GNUC__ -#define __attribute__(x) -#endif +#include -#if !defined(__WINNT__) && !defined(__KERNEL__) -#include -#elif defined(__linux__) -#include -#elif defined(__APPLE__) -#include -#elif defined(__WINNT__) -#include -#else -#error Unsupported operating system. -#endif +#ifdef __KERNEL__ +# include +#else /* __KERNEL__ */ +# include +#endif /* !__KERNEL__ */ #include "curproc.h" @@ -83,6 +75,21 @@ static inline int __is_po2(unsigned long long val) #define LOWEST_BIT_SET(x) ((x) & ~((x) - 1)) +/* Sparse annotations */ +#ifdef __KERNEL__ +# if !defined(__must_hold) +# ifdef __CHECKER__ +# define __must_hold(x) __attribute__((context(x, 1, 1))) +# else /* __CHECKER__ */ +# define __must_hold(x) +# endif /* !__CHECKER__ */ +# endif /* !__must_hold */ +#else /* __KERNEL__ */ +# define __acquires(x) +# define __releases(x) +# define __must_hold(x) +#endif /* !__KERNEL__ */ + /* * Lustre Error Checksum: calculates checksum * of Hex number by XORing each bit. @@ -90,7 +97,6 @@ static inline int __is_po2(unsigned long long val) #define LERRCHKSUM(hexnum) (((hexnum) & 0xf) ^ ((hexnum) >> 4 & 0xf) ^ \ ((hexnum) >> 8 & 0xf)) - /* * Some (nomina odiosa sunt) platforms define NULL as naked 0. This confuses * Lustre RETURN(NULL) macro. @@ -101,8 +107,6 @@ static inline int __is_po2(unsigned long long val) #define NULL ((void *)0) -#define LUSTRE_SRV_LNET_PID LUSTRE_LNET_PID - #ifdef __KERNEL__ #include @@ -152,7 +156,12 @@ void lc_watchdog_delete(struct lc_watchdog *lcw); /* Dump a debug log */ void lc_watchdog_dumplog(pid_t pid, void *data); -#endif /* __KERNEL__ */ +#else /* !__KERNEL__ */ +#include +#ifndef PAGE_SIZE +#define PAGE_SIZE sysconf(_SC_PAGESIZE) +#endif +#endif /* !__KERNEL__ */ /* need both kernel and user-land acceptor */ #define LNET_ACCEPTOR_MIN_RESERVED_PORT 512 @@ -161,9 +170,9 @@ void lc_watchdog_dumplog(pid_t pid, void *data); /* * libcfs pseudo device operations * - * struct cfs_psdev_t and - * cfs_psdev_register() and - * cfs_psdev_deregister() are declared in + * struct struct miscdevice and + * misc_register() and + * misc_deregister() are declared in * libcfs//-prim.h * * It's just draft now. @@ -177,44 +186,11 @@ struct cfs_psdev_file { }; struct cfs_psdev_ops { - int (*p_open)(unsigned long, void *); - int (*p_close)(unsigned long, void *); - int (*p_read)(struct cfs_psdev_file *, char *, unsigned long); - int (*p_write)(struct cfs_psdev_file *, char *, unsigned long); - int (*p_ioctl)(struct cfs_psdev_file *, unsigned long, void *); -}; - -/* - * Universal memory allocator API - */ -enum cfs_alloc_flags { - /* allocation is not allowed to block */ - CFS_ALLOC_ATOMIC = 0x1, - /* allocation is allowed to block */ - CFS_ALLOC_WAIT = 0x2, - /* allocation should return zeroed memory */ - CFS_ALLOC_ZERO = 0x4, - /* allocation is allowed to call file-system code to free/clean - * memory */ - CFS_ALLOC_FS = 0x8, - /* allocation is allowed to do io to free/clean memory */ - CFS_ALLOC_IO = 0x10, - /* don't report allocation failure to the console */ - CFS_ALLOC_NOWARN = 0x20, - /* standard allocator flag combination */ - CFS_ALLOC_STD = CFS_ALLOC_FS | CFS_ALLOC_IO, - CFS_ALLOC_USER = CFS_ALLOC_WAIT | CFS_ALLOC_FS | CFS_ALLOC_IO, - CFS_ALLOC_NOFS = CFS_ALLOC_WAIT | CFS_ALLOC_IO, - CFS_ALLOC_KERNEL = CFS_ALLOC_WAIT | CFS_ALLOC_IO | CFS_ALLOC_FS, -}; - -/* flags for cfs_page_alloc() in addition to enum cfs_alloc_flags */ -enum cfs_alloc_page_flags { - /* allow to return page beyond KVM. It has to be mapped into KVM by - * cfs_kmap() and unmapped with cfs_kunmap(). */ - CFS_ALLOC_HIGHMEM = 0x40, - CFS_ALLOC_HIGHUSER = CFS_ALLOC_WAIT | CFS_ALLOC_FS | CFS_ALLOC_IO | - CFS_ALLOC_HIGHMEM, + int (*p_open)(unsigned long, void *); + int (*p_close)(unsigned long, void *); + int (*p_read)(struct cfs_psdev_file *, char *, unsigned long); + int (*p_write)(struct cfs_psdev_file *, char *, unsigned long); + int (*p_ioctl)(struct cfs_psdev_file *, unsigned long, void __user *); }; /* @@ -227,11 +203,11 @@ void cfs_enter_debugger(void); * Defined by platform */ int unshare_fs_struct(void); -cfs_sigset_t cfs_get_blocked_sigs(void); -cfs_sigset_t cfs_block_allsigs(void); -cfs_sigset_t cfs_block_sigs(unsigned long sigs); -cfs_sigset_t cfs_block_sigsinv(unsigned long sigs); -void cfs_restore_sigs(cfs_sigset_t); +sigset_t cfs_get_blocked_sigs(void); +sigset_t cfs_block_allsigs(void); +sigset_t cfs_block_sigs(unsigned long sigs); +sigset_t cfs_block_sigsinv(unsigned long sigs); +void cfs_restore_sigs(sigset_t); int cfs_signal_pending(void); void cfs_clear_sigpending(void); @@ -258,35 +234,6 @@ void cfs_stack_trace_fill(struct cfs_stack_trace *trace); */ void *cfs_stack_trace_frame(struct cfs_stack_trace *trace, int frame_no); -#ifndef O_NOACCESS -#define O_NOACCESS O_NONBLOCK -#endif - -/* - * Universal open flags. - */ -#define CFS_O_NOACCESS 0003 -#define CFS_O_ACCMODE CFS_O_NOACCESS -#define CFS_O_CREAT 0100 -#define CFS_O_EXCL 0200 -#define CFS_O_NOCTTY 0400 -#define CFS_O_TRUNC 01000 -#define CFS_O_APPEND 02000 -#define CFS_O_NONBLOCK 04000 -#define CFS_O_NDELAY CFS_O_NONBLOCK -#define CFS_O_SYNC 010000 -#define CFS_O_ASYNC 020000 -#define CFS_O_DIRECT 040000 -#define CFS_O_LARGEFILE 0100000 -#define CFS_O_DIRECTORY 0200000 -#define CFS_O_NOFOLLOW 0400000 -#define CFS_O_NOATIME 01000000 - -/* convert local open flags to universal open flags */ -int cfs_oflags2univ(int flags); -/* convert universal open flags to local open flags */ -int cfs_univ2oflags(int flags); - /* * Random number handling */ @@ -297,9 +244,12 @@ unsigned int cfs_rand(void); void cfs_srand(unsigned int, unsigned int); void cfs_get_random_bytes(void *buf, int size); +#include +#include #include -#include #include +#include +#include #include #include #include @@ -310,21 +260,18 @@ void cfs_get_random_bytes(void *buf, int size); #include #include #include -#include /* container_of depends on "likely" which is defined in libcfs_private.h */ -static inline void *__container_of(void *ptr, unsigned long shift) +static inline void *__container_of(const void *ptr, unsigned long shift) { - if (unlikely(IS_ERR(ptr) || ptr == NULL)) - return ptr; - else - return (char *)ptr - shift; + if (unlikely(IS_ERR(ptr) || ptr == NULL)) + return ERR_CAST(ptr); + else + return (char *)ptr - shift; } -#define container_of0(ptr, type, member) \ - ((type *)__container_of((void *)(ptr), offsetof(type, member))) - -#define SET_BUT_UNUSED(a) do { } while(sizeof(a) - sizeof(a)) +#define container_of0(ptr, type, member) \ + ((type *)__container_of((ptr), offsetof(type, member))) #define _LIBCFS_H