Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights on source files changed since 2010-02-15.
[fs/lustre-release.git]
/
libcfs
/
include
/
libcfs
/
posix
/
libcfs.h
diff --git
a/libcfs/include/libcfs/posix/libcfs.h
b/libcfs/include/libcfs/posix/libcfs.h
index
b50554f
..
18551ca
100644
(file)
--- a/
libcfs/include/libcfs/posix/libcfs.h
+++ b/
libcfs/include/libcfs/posix/libcfs.h
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* 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.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-43,6
+43,7
@@
#ifndef __LIBCFS_POSIX_LIBCFS_H__
#define __LIBCFS_POSIX_LIBCFS_H__
#ifndef __LIBCFS_POSIX_LIBCFS_H__
#define __LIBCFS_POSIX_LIBCFS_H__
+#include <errno.h>
#include <sys/errno.h>
#include <string.h>
#include <stdarg.h>
#include <sys/errno.h>
#include <string.h>
#include <stdarg.h>
@@
-51,14
+52,28
@@
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/stat.h>
-#include <unistd.h>
#include <fcntl.h>
#include <limits.h>
#include <assert.h>
#include <fcntl.h>
#include <limits.h>
#include <assert.h>
+#include <sys/ioctl.h>
#include <sys/signal.h>
#include <signal.h>
#include <sys/time.h>
#include <time.h>
#include <sys/signal.h>
#include <signal.h>
#include <sys/time.h>
#include <time.h>
+#include <getopt.h>
+#include <signal.h>
+#include <pwd.h>
+#include <sys/socket.h>
+#include <sys/utsname.h>
+#include <ctype.h>
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef HAVE_LIBPTHREAD
#include <pthread.h>
#ifdef HAVE_LIBPTHREAD
#include <pthread.h>
@@
-90,8
+105,8
@@
#include <libcfs/posix/posix-wordsize.h>
#include <libcfs/user-bitops.h>
#include <libcfs/posix/posix-wordsize.h>
#include <libcfs/user-bitops.h>
-# define
do
_gettimeofday(tv) gettimeofday(tv, NULL);
-typedef unsigned long long cycles_t;
+# define
cfs
_gettimeofday(tv) gettimeofday(tv, NULL);
+typedef unsigned long long c
fs_c
ycles_t;
#define IS_ERR(a) ((unsigned long)(a) > (unsigned long)-1000L)
#define PTR_ERR(a) ((long)(a))
#define IS_ERR(a) ((unsigned long)(a) > (unsigned long)-1000L)
#define PTR_ERR(a) ((long)(a))
@@
-110,6
+125,9
@@
typedef struct dentry cfs_dentry_t;
typedef struct dirent64 cfs_dirent_t;
#endif
typedef struct dirent64 cfs_dirent_t;
#endif
+#define cfs_get_fd(x) NULL
+#define cfs_put_file(f) do {} while (0)
+
#ifdef __linux__
/* Userpace byte flipping */
# include <endian.h>
#ifdef __linux__
/* Userpace byte flipping */
# include <endian.h>
@@
-181,12
+199,14
@@
typedef struct dirent64 cfs_dirent_t;
# ifndef THREAD_SIZE /* x86_64 linux has THREAD_SIZE in userspace */
# ifndef THREAD_SIZE /* x86_64 linux has THREAD_SIZE in userspace */
-# define THREAD_SIZE 8192
+# define CFS_THREAD_SIZE 8192
+# else
+# define CFS_THREAD_SIZE THREAD_SIZE
# endif
# endif
-#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
+#define LUSTRE_TRACE_SIZE (
CFS_
THREAD_SIZE >> 5)
-#define CHECK_STACK() do { } while(0)
+#define C
FS_C
HECK_STACK() do { } while(0)
#define CDEBUG_STACK() (0L)
/* initial pid */
#define CDEBUG_STACK() (0L)
/* initial pid */
@@
-209,10
+229,10
@@
typedef __u32 cfs_kernel_cap_t;
/**
* Module support (probably shouldn't be used in generic code?)
*/
/**
* Module support (probably shouldn't be used in generic code?)
*/
-
struct
module {
+
typedef struct cfs_
module {
int count;
char *name;
int count;
char *name;
-};
+}
cfs_module_t
;
static inline void MODULE_AUTHOR(char *name)
{
static inline void MODULE_AUTHOR(char *name)
{
@@
-225,26
+245,26
@@
static inline void MODULE_AUTHOR(char *name)
#define __init
#define __exit
#define __init
#define __exit
-static inline int
request_module(char *name
)
+static inline int
cfs_request_module(const char *name, ...
)
{
return (-EINVAL);
}
{
return (-EINVAL);
}
-static inline void __
module_get(struct module
*module)
+static inline void __
cfs_module_get(cfs_module_t
*module)
{
}
{
}
-static inline int
try_module_get(struct module
*module)
+static inline int
cfs_try_module_get(cfs_module_t
*module)
{
return 1;
}
{
return 1;
}
-static inline void
module_put(struct module
*module)
+static inline void
cfs_module_put(cfs_module_t
*module)
{
}
{
}
-static inline int
module_refcount(struct module
*m)
+static inline int
cfs_module_refcount(cfs_module_t
*m)
{
return 1;
}
{
return 1;
}
@@
-255,20
+275,21
@@
static inline int module_refcount(struct module *m)
*
***************************************************************************/
*
***************************************************************************/
-struct shrinker {
+struct
cfs_
shrinker {
;
};
;
};
-#define DEFAULT_SEEKS (0)
+#define
CFS_
DEFAULT_SEEKS (0)
-typedef int (*shrinker_t)(int, unsigned int);
+typedef int (*
cfs_
shrinker_t)(int, unsigned int);
-static inline struct shrinker *set_shrinker(int seeks, shrinker_t shrinkert)
+static inline
+struct cfs_shrinker *cfs_set_shrinker(int seeks, cfs_shrinker_t shrink)
{
{
- return (struct shrinker *)0xdeadbea1; // Cannot return NULL here
+ return (struct
cfs_
shrinker *)0xdeadbea1; // Cannot return NULL here
}
}
-static inline void
remove_shrinker(struct
shrinker *shrinker)
+static inline void
cfs_remove_shrinker(struct cfs_
shrinker *shrinker)
{
}
{
}
@@
-283,27
+304,27
@@
static inline void remove_shrinker(struct shrinker *shrinker)
***************************************************************************/
struct radix_tree_root {
***************************************************************************/
struct radix_tree_root {
-
struct list_head
list;
+
cfs_list_t
list;
void *rnode;
};
struct radix_tree_node {
void *rnode;
};
struct radix_tree_node {
-
struct list_head
_node;
+
cfs_list_t
_node;
unsigned long index;
void *item;
};
unsigned long index;
void *item;
};
-
-#define RADIX_TREE_INIT(mask) { \
+
+#define RADIX_TREE_INIT(mask)
{ \
NOT_IMPLEMENTED \
}
#define RADIX_TREE(name, 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); \
+#define INIT_RADIX_TREE(root, mask)
\
+do {
\
+
CFS_INIT_LIST_HEAD(&((struct radix_tree_root *)root)->list); \
((struct radix_tree_root *)root)->rnode = NULL; \
} while (0)
((struct radix_tree_root *)root)->rnode = NULL; \
} while (0)
@@
-318,8
+339,8
@@
static inline int radix_tree_insert(struct radix_tree_root *root,
CFS_INIT_LIST_HEAD(&node->_node);
node->index = idx;
node->item = item;
CFS_INIT_LIST_HEAD(&node->_node);
node->index = idx;
node->item = item;
- list_add_tail(&node->_node, &root->list);
- root->rnode = (void *)1001;
+
cfs_
list_add_tail(&node->_node, &root->list);
+ root->rnode = (void *)1001;
return 0;
}
return 0;
}
@@
-328,10
+349,11
@@
static inline struct radix_tree_node *radix_tree_lookup0(struct radix_tree_root
{
struct radix_tree_node *node;
{
struct radix_tree_node *node;
- if (list_empty(&root->list))
+ if (
cfs_
list_empty(&root->list))
return NULL;
return NULL;
- list_for_each_entry(node, &root->list, _node)
+ cfs_list_for_each_entry_typed(node, &root->list,
+ struct radix_tree_node, _node)
if (node->index == idx)
return node;
if (node->index == idx)
return node;
@@
-357,10
+379,10
@@
static inline void *radix_tree_delete(struct radix_tree_root *root,
if (p == NULL)
return NULL;
if (p == NULL)
return NULL;
- list_del_init(&p->_node);
+
cfs_
list_del_init(&p->_node);
item = p->item;
free(p);
item = p->item;
free(p);
- if (list_empty(&root->list))
+ if (
cfs_
list_empty(&root->list))
root->rnode = NULL;
return item;
root->rnode = NULL;
return item;
@@
-395,4
+417,9
@@
static inline void radix_tree_preload_end(void)
typedef ssize_t (*read_actor_t)();
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)
+
#endif
#endif