X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fposix%2Flibcfs.h;h=403861ce6a12863260253ab45c24f2524a48354f;hp=17d37ce097db4547525a1af110f5d431f2598726;hb=c4a6999ceec8ac95415de4cb6099182d3f67d1cb;hpb=9fe4b52ad2ffadf125d9b5c78bb2ff9a01725707 diff --git a/libcfs/include/libcfs/posix/libcfs.h b/libcfs/include/libcfs/posix/libcfs.h index 17d37ce..403861c 100644 --- a/libcfs/include/libcfs/posix/libcfs.h +++ b/libcfs/include/libcfs/posix/libcfs.h @@ -26,6 +26,8 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -64,6 +66,8 @@ #include #include #include +#include +#include #ifdef HAVE_NETDB_H #include @@ -94,127 +98,31 @@ #endif #include -#include #include #include #include #include #include -#include #include -# define cfs_gettimeofday(tv) gettimeofday(tv, NULL); +#define do_gettimeofday(tv) gettimeofday(tv, NULL); typedef unsigned long long cfs_cycles_t; -#define IS_ERR(a) ((unsigned long)(a) > (unsigned long)-1000L) -#define PTR_ERR(a) ((long)(a)) -#define ERR_PTR(a) ((void*)((long)(a))) - /* this goes in posix-fs.h */ #include -#ifdef __linux__ #include -#endif -typedef struct file cfs_file_t; -typedef struct dentry cfs_dentry_t; -#ifdef __linux__ -typedef struct dirent64 cfs_dirent_t; -#endif +#define fget(x) NULL +#define fput(f) do {} while (0) -#define cfs_get_fd(x) NULL -#define cfs_put_file(f) do {} while (0) - -#ifdef __linux__ -/* Userpace byte flipping */ -# include -# include -# define __swab16(x) bswap_16(x) -# define __swab32(x) bswap_32(x) -# define __swab64(x) bswap_64(x) -# define __swab16s(x) do {*(x) = bswap_16(*(x));} while (0) -# define __swab32s(x) do {*(x) = bswap_32(*(x));} while (0) -# define __swab64s(x) do {*(x) = bswap_64(*(x));} while (0) -# if __BYTE_ORDER == __LITTLE_ENDIAN -# define le16_to_cpu(x) (x) -# define cpu_to_le16(x) (x) -# define le32_to_cpu(x) (x) -# define cpu_to_le32(x) (x) -# define le64_to_cpu(x) (x) -# define cpu_to_le64(x) (x) - -# define be16_to_cpu(x) bswap_16(x) -# define cpu_to_be16(x) bswap_16(x) -# define be32_to_cpu(x) bswap_32(x) -# define cpu_to_be32(x) bswap_32(x) -# define be64_to_cpu(x) (__u64)bswap_64(x) -# define cpu_to_be64(x) (__u64)bswap_64(x) -# else -# if __BYTE_ORDER == __BIG_ENDIAN -# define le16_to_cpu(x) bswap_16(x) -# define cpu_to_le16(x) bswap_16(x) -# define le32_to_cpu(x) bswap_32(x) -# define cpu_to_le32(x) bswap_32(x) -# define le64_to_cpu(x) (__u64)bswap_64(x) -# define cpu_to_le64(x) (__u64)bswap_64(x) - -# define be16_to_cpu(x) (x) -# define cpu_to_be16(x) (x) -# define be32_to_cpu(x) (x) -# define cpu_to_be32(x) (x) -# define be64_to_cpu(x) (x) -# define cpu_to_be64(x) (x) - -# else -# error "Unknown byte order" -# endif /* __BIG_ENDIAN */ -# endif /* __LITTLE_ENDIAN */ -#elif __APPLE__ -#define __cpu_to_le64(x) OSSwapHostToLittleInt64(x) -#define __cpu_to_le32(x) OSSwapHostToLittleInt32(x) -#define __cpu_to_le16(x) OSSwapHostToLittleInt16(x) - -#define __le16_to_cpu(x) OSSwapLittleToHostInt16(x) -#define __le32_to_cpu(x) OSSwapLittleToHostInt32(x) -#define __le64_to_cpu(x) OSSwapLittleToHostInt64(x) - -#define cpu_to_le64(x) __cpu_to_le64(x) -#define cpu_to_le32(x) __cpu_to_le32(x) -#define cpu_to_le16(x) __cpu_to_le16(x) - -#define le64_to_cpu(x) __le64_to_cpu(x) -#define le32_to_cpu(x) __le32_to_cpu(x) -#define le16_to_cpu(x) __le16_to_cpu(x) - -#define __swab16(x) OSSwapInt16(x) -#define __swab32(x) OSSwapInt32(x) -#define __swab64(x) OSSwapInt64(x) -#define __swab16s(x) do { *(x) = __swab16(*(x)); } while (0) -#define __swab32s(x) do { *(x) = __swab32(*(x)); } while (0) -#define __swab64s(x) do { *(x) = __swab64(*(x)); } while (0) -#endif - - -# ifndef THREAD_SIZE /* x86_64 linux has THREAD_SIZE in userspace */ -# define CFS_THREAD_SIZE 8192 -# else -# define CFS_THREAD_SIZE THREAD_SIZE -# endif - -#define LUSTRE_TRACE_SIZE (CFS_THREAD_SIZE >> 5) +#ifndef THREAD_SIZE /* x86_64 linux has THREAD_SIZE in userspace */ +# define THREAD_SIZE 8192 +#endif /* THREAD_SIZE */ #define CFS_CHECK_STACK(msgdata, mask, cdls) do {} while(0) #define CDEBUG_STACK() (0L) -/* initial pid */ -#define LUSTRE_LNET_PID 12345 - -#define ENTRY_NESTING_SUPPORT (1) -#define ENTRY_NESTING do {;} while (0) -#define EXIT_NESTING do {;} while (0) -#define __current_nesting_level() (0) - /** * Platform specific declarations for cfs_curproc API (libcfs/curproc.h) * @@ -222,15 +130,15 @@ typedef struct dirent64 cfs_dirent_t; */ #define CFS_CURPROC_COMM_MAX (sizeof ((struct task_struct *)0)->comm) -typedef __u32 cfs_kernel_cap_t; +typedef __u32 kernel_cap_t; /** * Module support (probably shouldn't be used in generic code?) */ -typedef struct cfs_module { +struct module { int count; char *name; -} cfs_module_t; +}; static inline void MODULE_AUTHOR(char *name) { @@ -243,30 +151,28 @@ static inline void MODULE_AUTHOR(char *name) #define __init #define __exit -#define EXPORT_SYMBOL(symbol) - -static inline int cfs_request_module(const char *name, ...) +static inline int request_module(const char *name, ...) { - return (-EINVAL); + return (-EINVAL); } -static inline void __cfs_module_get(cfs_module_t *module) +static inline void __module_get(struct module *module) { } -static inline int cfs_try_module_get(cfs_module_t *module) +static inline int try_module_get(struct module *module) { - return 1; + return 1; } -static inline void cfs_module_put(cfs_module_t *module) +static inline void module_put(struct module *module) { } -static inline int cfs_module_refcount(cfs_module_t *m) +static inline int module_refcount(struct module *m) { - return 1; + return 1; } /*************************************************************************** @@ -275,21 +181,30 @@ static inline int cfs_module_refcount(cfs_module_t *m) * ***************************************************************************/ -struct cfs_shrinker { - ; +struct shrinker { +#ifndef __INTEL_COMPILER + ; +#endif +}; + +struct shrinker_var { +#ifndef __INTEL_COMPILER + ; +#endif }; -#define CFS_DEFAULT_SEEKS (0) +#define DEF_SHRINKER_VAR(name, shrink, count, scan) \ + struct shrinker_var name = {}; -typedef int (*cfs_shrinker_t)(int, unsigned int); +#define DEFAULT_SEEKS (0) static inline -struct cfs_shrinker *cfs_set_shrinker(int seeks, cfs_shrinker_t shrink) +struct shrinker *set_shrinker(int seeks, struct shrinker_var *var) { - return (struct cfs_shrinker *)0xdeadbea1; // Cannot return NULL here + return (struct shrinker *)0xdeadbea1; /* Cannot return NULL here */ } -static inline void cfs_remove_shrinker(struct cfs_shrinker *shrinker) +static inline void remove_shrinker(struct shrinker *shrinker) { } @@ -304,88 +219,87 @@ static inline void cfs_remove_shrinker(struct cfs_shrinker *shrinker) ***************************************************************************/ struct radix_tree_root { - cfs_list_t list; - void *rnode; + struct list_head list; + void *rnode; }; struct radix_tree_node { - cfs_list_t _node; - unsigned long index; - void *item; + struct list_head _node; + unsigned long index; + void *item; }; -#define RADIX_TREE_INIT(mask) { \ - NOT_IMPLEMENTED \ +#define RADIX_TREE_INIT(mask) { \ + NOT_IMPLEMENTED \ } #define RADIX_TREE(name, mask) \ struct radix_tree_root name = RADIX_TREE_INIT(mask) -#define INIT_RADIX_TREE(root, mask) \ -do { \ - CFS_INIT_LIST_HEAD(&((struct radix_tree_root *)root)->list); \ - ((struct radix_tree_root *)root)->rnode = NULL; \ +#define INIT_RADIX_TREE(root, mask) \ +do { \ + INIT_LIST_HEAD(&((struct radix_tree_root *)root)->list); \ + ((struct radix_tree_root *)root)->rnode = NULL; \ } while (0) static inline int radix_tree_insert(struct radix_tree_root *root, - unsigned long idx, void *item) + unsigned long idx, void *item) { - struct radix_tree_node *node; - node = malloc(sizeof(*node)); - if (!node) - return -ENOMEM; - - CFS_INIT_LIST_HEAD(&node->_node); - node->index = idx; - node->item = item; - cfs_list_add_tail(&node->_node, &root->list); - root->rnode = (void *)1001; - return 0; + struct radix_tree_node *node; + node = malloc(sizeof(*node)); + if (!node) + return -ENOMEM; + + INIT_LIST_HEAD(&node->_node); + node->index = idx; + node->item = item; + list_add_tail(&node->_node, &root->list); + root->rnode = (void *)1001; + return 0; } -static inline struct radix_tree_node *radix_tree_lookup0(struct radix_tree_root *root, - unsigned long idx) +static inline struct radix_tree_node * +radix_tree_lookup0(struct radix_tree_root *root, unsigned long idx) { - struct radix_tree_node *node; + struct radix_tree_node *node; - if (cfs_list_empty(&root->list)) - return NULL; + if (list_empty(&root->list)) + return NULL; - cfs_list_for_each_entry_typed(node, &root->list, - struct radix_tree_node, _node) - if (node->index == idx) - return node; + list_for_each_entry(node, &root->list, _node) + if (node->index == idx) + return node; - return NULL; + return NULL; } static inline void *radix_tree_lookup(struct radix_tree_root *root, - unsigned long idx) + unsigned long idx) { - struct radix_tree_node *node = radix_tree_lookup0(root, idx); + struct radix_tree_node *node = radix_tree_lookup0(root, idx); - if (node) - return node->item; - return node; + if (node) + return node->item; + return node; } static inline void *radix_tree_delete(struct radix_tree_root *root, - unsigned long idx) + unsigned long idx) { - struct radix_tree_node *p = radix_tree_lookup0(root, idx); - void *item; + struct radix_tree_node *p = radix_tree_lookup0(root, idx); + void *item; - if (p == NULL) - return NULL; + if (p == NULL) + return NULL; - cfs_list_del_init(&p->_node); - item = p->item; - free(p); - if (cfs_list_empty(&root->list)) - root->rnode = NULL; + list_del_init(&p->_node); + item = p->item; + free(p); + if (list_empty(&root->list)) + root->rnode = NULL; - return item; + return item; } static inline unsigned int @@ -489,9 +403,14 @@ static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, typedef ssize_t (*read_actor_t)(); -#define CFS_IFSHIFT 12 +# ifndef IFTODT +# define IFSHIFT 12 +# define IFTODT(type) (((type) & S_IFMT) >> IFSHIFT) +# define DTTOIF(dirtype) ((dirtype) << IFSHIFT) +# endif -#define CFS_IFTODT(type) (((type) & S_IFMT) >> CFS_IFSHIFT) -#define CFS_DTTOIF(dirtype) ((dirtype) << CFS_IFSHIFT) +#ifndef ERESTARTSYS +#define ERESTARTSYS ERESTART +#endif #endif