X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fuser-prim.c;h=e9652f0c7c222d02870893976c4a60fe39b365a6;hb=b031b90a0320401db1ae474c4cbd89226bf5f2c9;hp=ee787e810552699de2b9cd512cae9304342c019d;hpb=b74555726d0e8ba1f11ebe959029c59ce9cdc842;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/user-prim.c b/libcfs/libcfs/user-prim.c
index ee787e8..e9652f0 100644
--- a/libcfs/libcfs/user-prim.c
+++ b/libcfs/libcfs/user-prim.c
@@ -26,8 +26,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) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -80,6 +82,11 @@ void cfs_waitq_add_exclusive(struct cfs_waitq *waitq, struct cfs_waitlink *link)
         (void)link;
 }
 
+void cfs_waitq_add_exclusive_head(struct cfs_waitq *waitq, struct cfs_waitlink *link)
+{
+        cfs_waitq_add_exclusive(waitq, link);
+}
+
 void cfs_waitq_del(struct cfs_waitq *waitq, struct cfs_waitlink *link)
 {
         LASSERT(waitq != NULL);
@@ -117,6 +124,9 @@ void cfs_waitq_wait(struct cfs_waitlink *link, cfs_task_state_t state)
 {
         LASSERT(link != NULL);
         (void)link;
+
+        /* well, wait for something to happen */
+        cfs_call_wait_handler(0);
 }
 
 int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state,
@@ -124,10 +134,11 @@ int64_t cfs_waitq_timedwait(struct cfs_waitlink *link, cfs_task_state_t state,
 {
         LASSERT(link != NULL);
         (void)link;
+        cfs_call_wait_handler(timeout);
         return 0;
 }
 
-void cfs_schedule_timeout(cfs_task_state_t state, int64_t timeout)
+void cfs_schedule_timeout_and_set_state(cfs_task_state_t state, int64_t timeout)
 {
         cfs_waitlink_t    l;
         /* sleep(timeout) here instead? */
@@ -212,7 +223,8 @@ static void *cfs_thread_helper(void *data)
         (void)f(arg);
         return NULL;
 }
-int cfs_create_thread(cfs_thread_t func, void *arg)
+
+int cfs_create_thread(cfs_thread_t func, void *arg, unsigned long flags)
 {
         pthread_t tid;
         pthread_attr_t tattr;
@@ -238,6 +250,21 @@ uid_t cfs_curproc_uid(void)
         return getuid();
 }
 
+gid_t cfs_curproc_gid(void)
+{
+        return getgid();
+}
+
+uid_t cfs_curproc_fsuid(void)
+{
+        return getuid();
+}
+
+gid_t cfs_curproc_fsgid(void)
+{
+        return getgid();
+}
+
 void cfs_enter_debugger(void)
 {
         /*
@@ -279,6 +306,20 @@ cfs_sigset_t cfs_block_sigs(cfs_sigset_t blocks)
         return old;
 }
 
+/* Block all signals except for the @sigs. It's only used in
+ * Linux kernel, just a dummy here. */
+cfs_sigset_t cfs_block_sigsinv(unsigned long sigs)
+{
+        cfs_sigset_t old;
+        int rc;
+
+        /* Return old blocked sigs */
+        rc = sigprocmask(SIG_SETMASK, NULL, &old);
+        LASSERT(rc == 0);
+
+        return old;
+}
+
 void cfs_restore_sigs(cfs_sigset_t old)
 {
         int   rc = sigprocmask(SIG_SETMASK, &old, NULL);