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
b=11680 fix sles11 build.
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
user-prim.c
diff --git
a/libcfs/libcfs/user-prim.c
b/libcfs/libcfs/user-prim.c
index
ee787e8
..
f5de83b
100644
(file)
--- a/
libcfs/libcfs/user-prim.c
+++ b/
libcfs/libcfs/user-prim.c
@@
-117,6
+117,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
+127,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? */
@@
-238,6
+242,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)
{
/*