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
LU-1146 build: batch update copyright messages
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
user-lock.c
diff --git
a/libcfs/libcfs/user-lock.c
b/libcfs/libcfs/user-lock.c
index
cee36d7
..
81d5a11
100644
(file)
--- a/
libcfs/libcfs/user-lock.c
+++ b/
libcfs/libcfs/user-lock.c
@@
-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.
*/
/*
@@
-71,41
+71,41
@@
* No-op implementation.
*/
* No-op implementation.
*/
-void
spin_lock_init(
spinlock_t *lock)
+void
cfs_spin_lock_init(cfs_
spinlock_t *lock)
{
LASSERT(lock != NULL);
(void)lock;
}
{
LASSERT(lock != NULL);
(void)lock;
}
-void
spin_lock(
spinlock_t *lock)
+void
cfs_spin_lock(cfs_
spinlock_t *lock)
{
(void)lock;
}
{
(void)lock;
}
-void
spin_unlock(
spinlock_t *lock)
+void
cfs_spin_unlock(cfs_
spinlock_t *lock)
{
(void)lock;
}
{
(void)lock;
}
-int
spin_trylock(
spinlock_t *lock)
+int
cfs_spin_trylock(cfs_
spinlock_t *lock)
{
(void)lock;
return 1;
}
{
(void)lock;
return 1;
}
-void
spin_lock_bh_init(
spinlock_t *lock)
+void
cfs_spin_lock_bh_init(cfs_
spinlock_t *lock)
{
LASSERT(lock != NULL);
(void)lock;
}
{
LASSERT(lock != NULL);
(void)lock;
}
-void
spin_lock_bh(
spinlock_t *lock)
+void
cfs_spin_lock_bh(cfs_
spinlock_t *lock)
{
LASSERT(lock != NULL);
(void)lock;
}
{
LASSERT(lock != NULL);
(void)lock;
}
-void
spin_unlock_bh(
spinlock_t *lock)
+void
cfs_spin_unlock_bh(cfs_
spinlock_t *lock)
{
LASSERT(lock != NULL);
(void)lock;
{
LASSERT(lock != NULL);
(void)lock;
@@
-119,20
+119,27
@@
void spin_unlock_bh(spinlock_t *lock)
* - __up(x)
*/
* - __up(x)
*/
-void
sema_init(struct semaphore
*s, int val)
+void
cfs_sema_init(cfs_semaphore_t
*s, int val)
{
LASSERT(s != NULL);
(void)s;
(void)val;
}
{
LASSERT(s != NULL);
(void)s;
(void)val;
}
-void __down(
struct semaphore
*s)
+void __down(
cfs_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
}
{
LASSERT(s != NULL);
(void)s;
}
-void __up(struct semaphore *s)
+int __down_interruptible(cfs_semaphore_t *s)
+{
+ LASSERT(s != NULL);
+ (void)s;
+ return 0;
+}
+
+void __up(cfs_semaphore_t *s)
{
LASSERT(s != NULL);
(void)s;
{
LASSERT(s != NULL);
(void)s;
@@
-149,43
+156,46
@@
void __up(struct semaphore *s)
static cfs_wait_handler_t wait_handler;
static cfs_wait_handler_t wait_handler;
-void init_completion_module(cfs_wait_handler_t handler)
+void
cfs_
init_completion_module(cfs_wait_handler_t handler)
{
wait_handler = handler;
}
{
wait_handler = handler;
}
-void init_completion(struct completion *c)
+int cfs_call_wait_handler(int timeout)
+{
+ if (!wait_handler)
+ return -ENOSYS;
+ return wait_handler(timeout);
+}
+
+void cfs_init_completion(cfs_completion_t *c)
{
LASSERT(c != NULL);
c->done = 0;
cfs_waitq_init(&c->wait);
}
{
LASSERT(c != NULL);
c->done = 0;
cfs_waitq_init(&c->wait);
}
-void c
omplete(struct completion
*c)
+void c
fs_complete(cfs_completion_t
*c)
{
LASSERT(c != NULL);
c->done = 1;
cfs_waitq_signal(&c->wait);
}
{
LASSERT(c != NULL);
c->done = 1;
cfs_waitq_signal(&c->wait);
}
-void
wait_for_completion(struct completion
*c)
+void
cfs_wait_for_completion(cfs_completion_t
*c)
{
LASSERT(c != NULL);
do {
{
LASSERT(c != NULL);
do {
- if (wait_handler)
- wait_handler(1000);
- else
+ if (cfs_call_wait_handler(1000) < 0)
break;
} while (c->done == 0);
}
break;
} while (c->done == 0);
}
-int
wait_for_completion_interruptible(struct completion
*c)
+int
cfs_wait_for_completion_interruptible(cfs_completion_t
*c)
{
LASSERT(c != NULL);
do {
{
LASSERT(c != NULL);
do {
- if (wait_handler)
- wait_handler(1000);
- else
+ if (cfs_call_wait_handler(1000) < 0)
break;
} while (c->done == 0);
return 0;
break;
} while (c->done == 0);
return 0;
@@
-202,51
+212,51
@@
int wait_for_completion_interruptible(struct completion *c)
* - up_write(x)
*/
* - up_write(x)
*/
-void
init_rwsem(struct rw_semaphore
*s)
+void
cfs_init_rwsem(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
}
{
LASSERT(s != NULL);
(void)s;
}
-void
down_read(struct rw_semaphore
*s)
+void
cfs_down_read(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
}
{
LASSERT(s != NULL);
(void)s;
}
-int
down_read_trylock(struct rw_semaphore
*s)
+int
cfs_down_read_trylock(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
return 1;
}
{
LASSERT(s != NULL);
(void)s;
return 1;
}
-void
down_write(struct rw_semaphore
*s)
+void
cfs_down_write(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
}
{
LASSERT(s != NULL);
(void)s;
}
-int
down_write_trylock(struct rw_semaphore
*s)
+int
cfs_down_write_trylock(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
return 1;
}
{
LASSERT(s != NULL);
(void)s;
return 1;
}
-void
up_read(struct rw_semaphore
*s)
+void
cfs_up_read(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
}
{
LASSERT(s != NULL);
(void)s;
}
-void
up_write(struct rw_semaphore
*s)
+void
cfs_up_write(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
}
{
LASSERT(s != NULL);
(void)s;
}
-void
fini_rwsem(struct rw_semaphore
*s)
+void
cfs_fini_rwsem(cfs_rw_semaphore_t
*s)
{
LASSERT(s != NULL);
(void)s;
{
LASSERT(s != NULL);
(void)s;
@@
-255,10
+265,10
@@
void fini_rwsem(struct rw_semaphore *s)
#ifdef HAVE_LIBPTHREAD
/*
#ifdef HAVE_LIBPTHREAD
/*
- *
C
ompletion
+ *
Multi-threaded user space c
ompletion
*/
*/
-void cfs_
init_completion(struct cfs_completion
*c)
+void cfs_
mt_init_completion(cfs_mt_completion_t
*c)
{
LASSERT(c != NULL);
c->c_done = 0;
{
LASSERT(c != NULL);
c->c_done = 0;
@@
-266,14
+276,14
@@
void cfs_init_completion(struct cfs_completion *c)
pthread_cond_init(&c->c_cond, NULL);
}
pthread_cond_init(&c->c_cond, NULL);
}
-void cfs_
fini_completion(struct cfs_completion
*c)
+void cfs_
mt_fini_completion(cfs_mt_completion_t
*c)
{
LASSERT(c != NULL);
pthread_mutex_destroy(&c->c_mut);
pthread_cond_destroy(&c->c_cond);
}
{
LASSERT(c != NULL);
pthread_mutex_destroy(&c->c_mut);
pthread_cond_destroy(&c->c_cond);
}
-void cfs_
complete(struct cfs_completion
*c)
+void cfs_
mt_complete(cfs_mt_completion_t
*c)
{
LASSERT(c != NULL);
pthread_mutex_lock(&c->c_mut);
{
LASSERT(c != NULL);
pthread_mutex_lock(&c->c_mut);
@@
-282,7
+292,7
@@
void cfs_complete(struct cfs_completion *c)
pthread_mutex_unlock(&c->c_mut);
}
pthread_mutex_unlock(&c->c_mut);
}
-void cfs_
wait_for_completion(struct cfs_completion
*c)
+void cfs_
mt_wait_for_completion(cfs_mt_completion_t
*c)
{
LASSERT(c != NULL);
pthread_mutex_lock(&c->c_mut);
{
LASSERT(c != NULL);
pthread_mutex_lock(&c->c_mut);
@@
-293,12
+303,12
@@
void cfs_wait_for_completion(struct cfs_completion *c)
}
/*
}
/*
- * atomic primitives
+ *
Multi-threaded user space
atomic primitives
*/
static pthread_mutex_t atomic_guard_lock = PTHREAD_MUTEX_INITIALIZER;
*/
static pthread_mutex_t atomic_guard_lock = PTHREAD_MUTEX_INITIALIZER;
-int cfs_
atomic_read(cfs
_atomic_t *a)
+int cfs_
mt_atomic_read(cfs_mt
_atomic_t *a)
{
int r;
{
int r;
@@
-308,14
+318,14
@@
int cfs_atomic_read(cfs_atomic_t *a)
return r;
}
return r;
}
-void cfs_
atomic_set(cfs
_atomic_t *a, int b)
+void cfs_
mt_atomic_set(cfs_mt
_atomic_t *a, int b)
{
pthread_mutex_lock(&atomic_guard_lock);
a->counter = b;
pthread_mutex_unlock(&atomic_guard_lock);
}
{
pthread_mutex_lock(&atomic_guard_lock);
a->counter = b;
pthread_mutex_unlock(&atomic_guard_lock);
}
-int cfs_
atomic_dec_and_test(cfs
_atomic_t *a)
+int cfs_
mt_atomic_dec_and_test(cfs_mt
_atomic_t *a)
{
int r;
{
int r;
@@
-325,20
+335,20
@@
int cfs_atomic_dec_and_test(cfs_atomic_t *a)
return (r == 0);
}
return (r == 0);
}
-void cfs_
atomic_inc(cfs
_atomic_t *a)
+void cfs_
mt_atomic_inc(cfs_mt
_atomic_t *a)
{
pthread_mutex_lock(&atomic_guard_lock);
++a->counter;
pthread_mutex_unlock(&atomic_guard_lock);
}
{
pthread_mutex_lock(&atomic_guard_lock);
++a->counter;
pthread_mutex_unlock(&atomic_guard_lock);
}
-void cfs_
atomic_dec(cfs
_atomic_t *a)
+void cfs_
mt_atomic_dec(cfs_mt
_atomic_t *a)
{
pthread_mutex_lock(&atomic_guard_lock);
--a->counter;
pthread_mutex_unlock(&atomic_guard_lock);
}
{
pthread_mutex_lock(&atomic_guard_lock);
--a->counter;
pthread_mutex_unlock(&atomic_guard_lock);
}
-void cfs_
atomic_add(int b, cfs
_atomic_t *a)
+void cfs_
mt_atomic_add(int b, cfs_mt
_atomic_t *a)
{
pthread_mutex_lock(&atomic_guard_lock);
{
pthread_mutex_lock(&atomic_guard_lock);
@@
-346,7
+356,7
@@
void cfs_atomic_add(int b, cfs_atomic_t *a)
pthread_mutex_unlock(&atomic_guard_lock);
}
pthread_mutex_unlock(&atomic_guard_lock);
}
-void cfs_
atomic_sub(int b, cfs
_atomic_t *a)
+void cfs_
mt_atomic_sub(int b, cfs_mt
_atomic_t *a)
{
pthread_mutex_lock(&atomic_guard_lock);
a->counter -= b;
{
pthread_mutex_lock(&atomic_guard_lock);
a->counter -= b;