X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=libcfs%2Finclude%2Flibcfs%2Flibcfs.h;h=e8395f1b881a2c3feb76b6189f75e438bea1bf1c;hb=92b7657096fbc67ae14ef278d838cb50efe317cc;hp=be826b49d402a90429b91d74c915933fa070c7a3;hpb=84a3fd67356c8073a917ea6abd63928055e38156;p=fs%2Flustre-release.git diff --git a/libcfs/include/libcfs/libcfs.h b/libcfs/include/libcfs/libcfs.h index be826b4..e8395f1 100644 --- a/libcfs/include/libcfs/libcfs.h +++ b/libcfs/include/libcfs/libcfs.h @@ -27,7 +27,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,14 +41,12 @@ #define __attribute__(x) #endif -#if !defined(__WINNT__) && !defined(__KERNEL__) +#include + +#if !defined(__KERNEL__) #include #elif defined(__linux__) #include -#elif defined(__APPLE__) -#include -#elif defined(__WINNT__) -#include #else #error Unsupported operating system. #endif @@ -63,6 +61,10 @@ #define ARRAY_SIZE(a) ((sizeof (a)) / (sizeof ((a)[0]))) #endif +#if !defined(swap) +#define swap(x,y) do { typeof(x) z = x; x = y; y = z; } while (0) +#endif + #if !defined(container_of) /* given a pointer @ptr to the field @member embedded into type (usually * struct) @type, return pointer to the embedding instance of @type. */ @@ -79,6 +81,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. @@ -86,7 +103,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. @@ -148,7 +164,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 @@ -157,9 +178,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. @@ -181,37 +202,6 @@ struct cfs_psdev_ops { }; /* - * 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, -}; - -/* 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, -}; - -/* * Drop into debugger, if possible. Implementation is provided by platform. */ @@ -220,26 +210,15 @@ void cfs_enter_debugger(void); /* * Defined by platform */ -void cfs_daemonize(char *str); -int cfs_daemonize_ctxt(char *str); -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); +int unshare_fs_struct(void); +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); -/* - * XXX Liang: - * these macros should be removed in the future, - * we keep them just for keeping libcfs compatible - * with other branches. - */ -#define libcfs_daemonize(s) cfs_daemonize(s) -#define cfs_sigmask_lock(f) do { f= 0; } while (0) -#define cfs_sigmask_unlock(f) do { f= 0; } while (0) - int convert_server_error(__u64 ecode); int convert_client_oflag(int cflag, int *result); @@ -263,35 +242,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 */ @@ -302,9 +252,11 @@ 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 @@ -312,23 +264,21 @@ void cfs_get_random_bytes(void *buf, int size); #include #include #include +#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