* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <libcfs/posix/posix-wordsize.h>
#include <libcfs/user-bitops.h>
-# 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 <sys/mount.h>
#include <mntent.h>
#endif
-typedef struct file cfs_file_t;
-typedef struct dentry cfs_dentry_t;
-#ifdef __linux__
-typedef struct dirent64 cfs_dirent_t;
-#endif
-
-#define cfs_get_fd(x) NULL
-#define cfs_put_file(f) do {} while (0)
+#define fget(x) NULL
+#define fput(f) do {} while (0)
#ifdef __linux__
/* Userpace byte flipping */
#define __swab64s(x) do { *(x) = __swab64(*(x)); } while (0)
#endif
+#if !defined(ALIGN)
+#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask))
+#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1)
+#endif
# ifndef THREAD_SIZE /* x86_64 linux has THREAD_SIZE in userspace */
-# define CFS_THREAD_SIZE 8192
+# define THREAD_SIZE 8192
# else
-# define CFS_THREAD_SIZE THREAD_SIZE
# endif
-#define LUSTRE_TRACE_SIZE (CFS_THREAD_SIZE >> 5)
-
#define CFS_CHECK_STACK(msgdata, mask, cdls) do {} while(0)
#define CDEBUG_STACK() (0L)
*/
#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)
{
#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;
}
/***************************************************************************
*
***************************************************************************/
-struct cfs_shrinker {
- ;
+struct shrinker {
+#ifndef __INTEL_COMPILER
+ ;
+#endif
};
-#define CFS_DEFAULT_SEEKS (0)
+#define DEFAULT_SEEKS (0)
-typedef int (*cfs_shrinker_t)(int, unsigned int);
+typedef int (*shrinker_t)(int, unsigned int);
static inline
-struct cfs_shrinker *cfs_set_shrinker(int seeks, cfs_shrinker_t shrink)
+struct shrinker *set_shrinker(int seeks, shrinker_t shrink)
{
- 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)
{
}
***************************************************************************/
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
typedef ssize_t (*read_actor_t)();
-#define CFS_IFSHIFT 12
-
-#define CFS_IFTODT(type) (((type) & S_IFMT) >> CFS_IFSHIFT)
-#define CFS_DTTOIF(dirtype) ((dirtype) << CFS_IFSHIFT)
+# ifndef IFTODT
+# define IFSHIFT 12
+# define IFTODT(type) (((type) & S_IFMT) >> IFSHIFT)
+# define DTTOIF(dirtype) ((dirtype) << IFSHIFT)
+# endif
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff