diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-25 06:28:28 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-02-04 08:21:32 +0100 |
| commit | 8b0d8e03f847d9c1677b8a193cd124debbc54633 (patch) | |
| tree | e2b63705b4a4901f827c92f47acff9abd26875b8 /fs/dlm/lock.c | |
| parent | Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/pa... (diff) | |
| download | linux-8b0d8e03f847d9c1677b8a193cd124debbc54633.tar.xz linux-8b0d8e03f847d9c1677b8a193cd124debbc54633.zip | |
dlm: use proper C for dlm/requestqueue stuff (and fix alignment bug)
a) don't cast the pointer to dlm_header *, we use it as dlm_message *
anyway.
b) we copy the message into a queue element, then pass the pointer to
copy to dlm_receive_message_saved(); declare it properly to make sure
that we have the right alignment.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/lock.c')
| -rw-r--r-- | fs/dlm/lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index ff4a198fa677..d9f07a42e3cf 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -3802,7 +3802,7 @@ static void dlm_receive_message(struct dlm_ls *ls, struct dlm_message *ms, int nodeid) { if (dlm_locking_stopped(ls)) { - dlm_add_requestqueue(ls, nodeid, (struct dlm_header *) ms); + dlm_add_requestqueue(ls, nodeid, ms); } else { dlm_wait_requestqueue(ls); _receive_message(ls, ms); |