diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 17:01:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 17:01:37 +0100 |
| commit | dd8856bda5f1308beb113281b248683992998a9e (patch) | |
| tree | 5dc35290cdbca32cbdecd93a76fa5b29075ac18c /fs/ocfs2/dlm/dlmcommon.h | |
| parent | [PATCH] uclinux: fix mmap() of directory for nommu case (diff) | |
| parent | Actually update the fixed up compile failures. (diff) | |
| download | linux-dd8856bda5f1308beb113281b248683992998a9e.tar.xz linux-dd8856bda5f1308beb113281b248683992998a9e.zip | |
Merge git://git.infradead.org/users/dhowells/workq-2.6
* git://git.infradead.org/users/dhowells/workq-2.6:
Actually update the fixed up compile failures.
WorkQueue: Fix up arch-specific work items where possible
WorkStruct: make allyesconfig
WorkStruct: Pass the work_struct pointer instead of context data
WorkStruct: Merge the pending bit into the wq_data pointer
WorkStruct: Typedef the work function prototype
WorkStruct: Separate delayable and non-delayable events.
Diffstat (limited to 'fs/ocfs2/dlm/dlmcommon.h')
| -rw-r--r-- | fs/ocfs2/dlm/dlmcommon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index fa968180b072..6b6ff76538c5 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h @@ -153,7 +153,7 @@ static inline struct hlist_head *dlm_lockres_hash(struct dlm_ctxt *dlm, unsigned * called functions that cannot be directly called from the * net message handlers for some reason, usually because * they need to send net messages of their own. */ -void dlm_dispatch_work(void *data); +void dlm_dispatch_work(struct work_struct *work); struct dlm_lock_resource; struct dlm_work_item; |