X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fposix%2Flibcfs.h;h=d19d12ff07389dc51188a18bc98ec79ff18413f1;hb=refs%2Fchanges%2F23%2F11423%2F2;hp=909deeffa08819ec48c03244972f144b99b95678;hpb=6cdf5597aaf4ccb119c1747efb29551ea4d2500a;p=fs%2Flustre-release.git diff --git a/libcfs/include/libcfs/posix/libcfs.h b/libcfs/include/libcfs/posix/libcfs.h index 909deef..d19d12f 100644 --- a/libcfs/include/libcfs/posix/libcfs.h +++ b/libcfs/include/libcfs/posix/libcfs.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * 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/ @@ -66,6 +66,8 @@ #include #include #include +#include +#include #ifdef HAVE_NETDB_H #include @@ -96,21 +98,15 @@ #endif #include -#include #include #include #include #include #include -#include #include # define do_gettimeofday(tv) gettimeofday(tv, NULL); -typedef unsigned long long 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))) +typedef unsigned long long cfs_cycles_t; /* this goes in posix-fs.h */ #include @@ -119,11 +115,8 @@ typedef unsigned long long cycles_t; #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) #ifdef __linux__ /* Userpace byte flipping */ @@ -147,16 +140,16 @@ typedef struct dirent64 cfs_dirent_t; # 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) bswap_64(x) -# define cpu_to_be64(x) bswap_64(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) bswap_64(x) -# define cpu_to_le64(x) bswap_64(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) @@ -169,39 +162,14 @@ typedef struct dirent64 cfs_dirent_t; # 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 THREAD_SIZE 8192 +# else # endif -#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5) - -#define CHECK_STACK() do { } while(0) +#define CFS_CHECK_STACK(msgdata, mask, cdls) do {} while(0) #define CDEBUG_STACK() (0L) /* initial pid */ @@ -219,7 +187,7 @@ 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?) @@ -240,9 +208,9 @@ static inline void MODULE_AUTHOR(char *name) #define __init #define __exit -static inline int request_module(char *name) +static inline int request_module(const char *name, ...) { - return (-EINVAL); + return (-EINVAL); } static inline void __module_get(struct module *module) @@ -251,7 +219,7 @@ static inline void __module_get(struct module *module) static inline int try_module_get(struct module *module) { - return 1; + return 1; } static inline void module_put(struct module *module) @@ -261,7 +229,7 @@ static inline void module_put(struct module *module) static inline int module_refcount(struct module *m) { - return 1; + return 1; } /*************************************************************************** @@ -271,16 +239,26 @@ static inline int module_refcount(struct module *m) ***************************************************************************/ struct shrinker { - ; +#ifndef __INTEL_COMPILER + ; +#endif }; -#define DEFAULT_SEEKS (0) +struct shrinker_var { +#ifndef __INTEL_COMPILER + ; +#endif +}; + +#define DEF_SHRINKER_VAR(name, shrink, count, scan) \ + struct shrinker_var name = {}; -typedef int (*shrinker_t)(int, unsigned int); +#define DEFAULT_SEEKS (0) -static inline struct shrinker *set_shrinker(int seeks, shrinker_t shrinkert) +static inline +struct shrinker *set_shrinker(int seeks, struct shrinker_var *var) { - return (struct shrinker *)0xdeadbea1; // Cannot return NULL here + return (struct shrinker *)0xdeadbea1; /* Cannot return NULL here */ } static inline void remove_shrinker(struct shrinker *shrinker) @@ -298,88 +276,87 @@ static inline void remove_shrinker(struct shrinker *shrinker) ***************************************************************************/ struct radix_tree_root { - struct list_head list; - void *rnode; + struct list_head list; + void *rnode; }; struct radix_tree_node { - struct list_head _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) + 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; \ + 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; - 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 (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; - list_del_init(&p->_node); - item = p->item; - free(p); - if (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 @@ -409,6 +386,88 @@ static inline void radix_tree_preload_end(void) { } +/*************************************************************************** + * + * Linux kernel red black tree emulation. + * + ***************************************************************************/ +struct rb_node { + unsigned long rb_parent_color; +#define RB_RED 0 +#define RB_BLACK 1 + struct rb_node *rb_right; + struct rb_node *rb_left; +}; + +struct rb_root { + struct rb_node *rb_node; +}; + + +#define rb_parent(r) ((struct rb_node *)((r)->rb_parent_color & ~3)) +#define rb_color(r) ((r)->rb_parent_color & 1) +#define rb_is_red(r) (!rb_color(r)) +#define rb_is_black(r) rb_color(r) +#define rb_set_red(r) do { (r)->rb_parent_color &= ~1; } while (0) +#define rb_set_black(r) do { (r)->rb_parent_color |= 1; } while (0) + +static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p) +{ + rb->rb_parent_color = (rb->rb_parent_color & 3) | (unsigned long)p; +} +static inline void rb_set_color(struct rb_node *rb, int color) +{ + rb->rb_parent_color = (rb->rb_parent_color & ~1) | color; +} + +#define RB_ROOT ((struct rb_root) { NULL, }) +#define rb_entry(ptr, type, member) container_of(ptr, type, member) + +#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL) +#define RB_EMPTY_NODE(node) (rb_parent(node) == node) +#define RB_CLEAR_NODE(node) (rb_set_parent(node, node)) + +static inline void rb_init_node(struct rb_node *rb) +{ + rb->rb_parent_color = 0; + rb->rb_right = NULL; + rb->rb_left = NULL; + RB_CLEAR_NODE(rb); +} + +extern void rb_insert_color(struct rb_node *, struct rb_root *); +extern void rb_erase(struct rb_node *, struct rb_root *); + +/* Find logical next and previous nodes in a tree */ +extern struct rb_node *rb_next(const struct rb_node *); +extern struct rb_node *rb_prev(const struct rb_node *); +extern struct rb_node *rb_first(const struct rb_root *); +extern struct rb_node *rb_last(const struct rb_root *); +static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, + struct rb_node **rb_link) +{ + node->rb_parent_color = (unsigned long)parent; + node->rb_left = node->rb_right = NULL; + + *rb_link = node; +} + +/*************************************************************************** + * + * End of Linux kernel red black tree emulation. + * + ***************************************************************************/ + typedef ssize_t (*read_actor_t)(); +# ifndef IFTODT +# define IFSHIFT 12 +# define IFTODT(type) (((type) & S_IFMT) >> IFSHIFT) +# define DTTOIF(dirtype) ((dirtype) << IFSHIFT) +# endif + +#ifndef ERESTARTSYS +#define ERESTARTSYS ERESTART +#endif + #endif