projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
fs
/
ocfs2
/
dlm
/
dlmthread.c
diff --git
a/fs/ocfs2/dlm/dlmthread.c
b/fs/ocfs2/dlm/dlmthread.c
index
2b264c6
..
cebd089
100644
(file)
--- a/
fs/ocfs2/dlm/dlmthread.c
+++ b/
fs/ocfs2/dlm/dlmthread.c
@@
-76,7
+76,7
@@
repeat:
goto repeat;
}
remove_wait_queue(&res->wq, &wait);
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
}
int __dlm_lockres_has_locks(struct dlm_lock_resource *res)