* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
#define DEBUG_SUBSYSTEM S_CLASS
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
#include <obd_support.h>
#include <lustre_handles.h>
#include <lustre_lib.h>
-#ifndef __KERNEL__
-# define list_add_rcu cfs_list_add
-# define list_del_rcu cfs_list_del
-# define list_for_each_rcu cfs_list_for_each
-# define list_for_each_safe_rcu cfs_list_for_each_safe
-# define list_for_each_entry_rcu cfs_list_for_each_entry
-# define rcu_read_lock() spin_lock(&bucket->lock)
-# define rcu_read_unlock() spin_unlock(&bucket->lock)
-#endif /* !__KERNEL__ */
static __u64 handle_base;
#define HANDLE_INCR 7
static spinlock_t handle_base_lock;
static struct handle_bucket {
- spinlock_t lock;
- cfs_list_t head;
+ spinlock_t lock;
+ struct list_head head;
} *handle_hash;
#define HANDLE_HASH_SIZE (1 << 16)
ENTRY;
LASSERT(h != NULL);
- LASSERT(cfs_list_empty(&h->h_link));
+ LASSERT(list_empty(&h->h_link));
/*
* This is fast, but simplistic cookie generation algorithm, it will
static void class_handle_unhash_nolock(struct portals_handle *h)
{
- if (cfs_list_empty(&h->h_link)) {
+ if (list_empty(&h->h_link)) {
CERROR("removing an already-removed handle ("LPX64")\n",
h->h_cookie);
return;
}
EXPORT_SYMBOL(class_handle2object);
-void class_handle_free_cb(cfs_rcu_head_t *rcu)
+void class_handle_free_cb(struct rcu_head *rcu)
{
- struct portals_handle *h = RCU2HANDLE(rcu);
- void *ptr = (void *)(unsigned long)h->h_cookie;
+ struct portals_handle *h;
+ void *ptr;
+
+ h = container_of(rcu, struct portals_handle, h_rcu);
+ ptr = (void *)(unsigned long)h->h_cookie;
if (h->h_ops->hop_free != NULL)
h->h_ops->hop_free(ptr, h->h_size);
spin_lock_init(&handle_base_lock);
for (bucket = handle_hash + HANDLE_HASH_SIZE - 1; bucket >= handle_hash;
bucket--) {
- CFS_INIT_LIST_HEAD(&bucket->head);
+ INIT_LIST_HEAD(&bucket->head);
spin_lock_init(&bucket->lock);
}
- /** bug 21430: add randomness to the initial base */
- cfs_get_random_bytes(seed, sizeof(seed));
- cfs_gettimeofday(&tv);
- cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+ /** bug 21430: add randomness to the initial base */
+ cfs_get_random_bytes(seed, sizeof(seed));
+ do_gettimeofday(&tv);
+ cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
cfs_get_random_bytes(&handle_base, sizeof(handle_base));
LASSERT(handle_base != 0ULL);