Revert "LU-3427 build: fix 'error handling' issues"

[fs/lustre-release.git] / libcfs / libcfs / user-lock.c

diff --git a/libcfs/libcfs/user-lock.c b/libcfs/libcfs/user-lock.c
index 2657dbc..214ca3a 100644 (file)
--- a/libcfs/libcfs/user-lock.c
+++ b/libcfs/libcfs/user-lock.c
@@ -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, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -61,6 +61,7 @@
  *
  * - spin_lock_init(x)
  * - spin_lock(x)
+ * - spin_lock_nested(x, subclass)
  * - spin_unlock(x)
  * - spin_trylock(x)
  *
@@ -72,42 +73,42 @@
 
 void spin_lock_init(spinlock_t *lock)
 {
-        LASSERT(lock != NULL);
-        (void)lock;
+       LASSERT(lock != NULL);
+       (void)lock;
 }
 
 void spin_lock(spinlock_t *lock)
 {
-        (void)lock;
+       (void)lock;
 }
 
 void spin_unlock(spinlock_t *lock)
 {
-        (void)lock;
+       (void)lock;
 }
 
 int spin_trylock(spinlock_t *lock)
 {
-        (void)lock;
+       (void)lock;
        return 1;
 }
 
 void spin_lock_bh_init(spinlock_t *lock)
 {
-        LASSERT(lock != NULL);
-        (void)lock;
+       LASSERT(lock != NULL);
+       (void)lock;
 }
 
 void spin_lock_bh(spinlock_t *lock)
 {
-        LASSERT(lock != NULL);
-        (void)lock;
+       LASSERT(lock != NULL);
+       (void)lock;
 }
 
 void spin_unlock_bh(spinlock_t *lock)
 {
-        LASSERT(lock != NULL);
-        (void)lock;
+       LASSERT(lock != NULL);
+       (void)lock;
 }
 
 /*
@@ -120,21 +121,28 @@ void spin_unlock_bh(spinlock_t *lock)
 
 void sema_init(struct semaphore *s, int val)
 {
-        LASSERT(s != NULL);
-        (void)s;
-        (void)val;
+       LASSERT(s != NULL);
+       (void)s;
+       (void)val;
 }
 
 void __down(struct semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
+}
+
+int __down_interruptible(struct semaphore *s)
+{
+       LASSERT(s != NULL);
+       (void)s;
+       return 0;
 }
 
 void __up(struct semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
 }
 
 
@@ -145,31 +153,58 @@ void __up(struct semaphore *s)
  * - complete(c)
  * - wait_for_completion(c)
  */
+static wait_handler_t wait_handler;
 
+void init_completion_module(wait_handler_t handler)
+{
+       wait_handler = handler;
+}
+
+int call_wait_handler(int timeout)
+{
+       if (!wait_handler)
+               return -ENOSYS;
+       return wait_handler(timeout);
+}
+
+#ifndef HAVE_LIBPTHREAD
 void init_completion(struct completion *c)
 {
-        LASSERT(c != NULL);
-        c->done = 0;
-        cfs_waitq_init(&c->wait);
+       LASSERT(c != NULL);
+       c->done = 0;
+       cfs_waitq_init(&c->wait);
+}
+
+void fini_completion(struct completion *c)
+{
 }
 
 void complete(struct completion *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)
 {
-        LASSERT(c != NULL);
+       LASSERT(c != NULL);
+       do {
+               if (call_wait_handler(1000) < 0)
+                       break;
+       } while (c->done == 0);
 }
 
 int wait_for_completion_interruptible(struct completion *c)
 {
-        LASSERT(c != NULL);
-        return 0;
+       LASSERT(c != NULL);
+       do {
+               if (call_wait_handler(1000) < 0)
+                       break;
+       } while (c->done == 0);
+       return 0;
 }
+#endif /* HAVE_LIBPTHREAD */
 
 /*
  * rw_semaphore:
@@ -184,55 +219,61 @@ int wait_for_completion_interruptible(struct completion *c)
 
 void init_rwsem(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
 }
 
 void down_read(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
 }
 
 int down_read_trylock(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
        return 1;
 }
 
 void down_write(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
 }
 
 int down_write_trylock(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
        return 1;
 }
 
 void up_read(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
 }
 
 void up_write(struct rw_semaphore *s)
 {
-        LASSERT(s != NULL);
-        (void)s;
+       LASSERT(s != NULL);
+       (void)s;
+}
+
+void fini_rwsem(struct rw_semaphore *s)
+{
+       LASSERT(s != NULL);
+       (void)s;
 }
 
 #ifdef HAVE_LIBPTHREAD
 
 /*
- * Completion
+ * Multi-threaded user space completion
  */
 
-void cfs_init_completion(struct cfs_completion *c)
+void init_completion(struct completion *c)
 {
         LASSERT(c != NULL);
         c->c_done = 0;
@@ -240,14 +281,14 @@ void cfs_init_completion(struct cfs_completion *c)
         pthread_cond_init(&c->c_cond, NULL);
 }
 
-void cfs_fini_completion(struct cfs_completion *c)
+void fini_completion(struct completion *c)
 {
         LASSERT(c != NULL);
         pthread_mutex_destroy(&c->c_mut);
         pthread_cond_destroy(&c->c_cond);
 }
 
-void cfs_complete(struct cfs_completion *c)
+void complete(struct completion *c)
 {
         LASSERT(c != NULL);
         pthread_mutex_lock(&c->c_mut);
@@ -256,7 +297,7 @@ void cfs_complete(struct cfs_completion *c)
         pthread_mutex_unlock(&c->c_mut);
 }
 
-void cfs_wait_for_completion(struct cfs_completion *c)
+void wait_for_completion(struct completion *c)
 {
         LASSERT(c != NULL);
         pthread_mutex_lock(&c->c_mut);
@@ -267,12 +308,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;
 
-int cfs_atomic_read(cfs_atomic_t *a)
+int mt_atomic_read(mt_atomic_t *a)
 {
         int r;
 
@@ -282,14 +323,14 @@ int cfs_atomic_read(cfs_atomic_t *a)
         return r;
 }
 
-void cfs_atomic_set(cfs_atomic_t *a, int b)
+void mt_atomic_set(mt_atomic_t *a, int b)
 {
         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 mt_atomic_dec_and_test(mt_atomic_t *a)
 {
         int r;
 
@@ -299,20 +340,20 @@ int cfs_atomic_dec_and_test(cfs_atomic_t *a)
         return (r == 0);
 }
 
-void cfs_atomic_inc(cfs_atomic_t *a)
+void mt_atomic_inc(mt_atomic_t *a)
 {
         pthread_mutex_lock(&atomic_guard_lock);
         ++a->counter;
         pthread_mutex_unlock(&atomic_guard_lock);
 }
 
-void cfs_atomic_dec(cfs_atomic_t *a)
+void mt_atomic_dec(mt_atomic_t *a)
 {
         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 mt_atomic_add(int b, mt_atomic_t *a)
 
 {
         pthread_mutex_lock(&atomic_guard_lock);
@@ -320,7 +361,7 @@ void cfs_atomic_add(int b, cfs_atomic_t *a)
         pthread_mutex_unlock(&atomic_guard_lock);
 }
 
-void cfs_atomic_sub(int b, cfs_atomic_t *a)
+void mt_atomic_sub(int b, mt_atomic_t *a)
 {
         pthread_mutex_lock(&atomic_guard_lock);
         a->counter -= b;