dlm: use proper C for dlm/requestqueue stuff (and fix alignment bug)
David Teigland
maintainerPATCH 1/16 dlm: use proper C for dlm/requestqueue stuff (and fix alignment bug)
From: Al Viro <[email protected]>
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 <[email protected]>
Signed-off-by David Teigland <[email protected]>
--- fs/dlm/lock.c | 2 +- fs/dlm/requestqueue.c | 12 ++++++------ fs/dlm/requestqueue.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
fs/dlm/lock.c +1 -1
@@ -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);
fs/dlm/requestqueue.c +6 -6
@@ -20,7 +20,7 @@struct rq_entry {struct list_head list;int nodeid; -char request[0 ]; +struct dlm_message request; };/*
@@ -30,10 +30,10 @@ struct rq_entry {* lockspace is enabled on some while still suspended on others. */ -void dlm_add_requestqueue (struct dlm_ls *ls,int nodeid,struct dlm_header *hd) +void dlm_add_requestqueue (struct dlm_ls *ls,int nodeid,struct dlm_message *ms) {struct rq_entry *e; -int length = hd->h_length; +int length = ms->m_header.h_length -sizeof (struct dlm_message ); e =kmalloc (sizeof (struct rq_entry ) + length,GFP_KERNEL );if (!e) {
@@ -42,7 +42,7 @@ void dlm_add_requestqueue(struct dlm_ls *ls, int nodeid, struct dlm_header *hd) } e->nodeid = nodeid; -memcpy (e->request, hd, length); +memcpy (&e->request, ms, ms->m_header.h_length);mutex_lock (&ls->ls_requestqueue_mutex);list_add_tail (&e->list, &ls->ls_requestqueue);
@@ -76,7 +76,7 @@ int dlm_process_requestqueue(struct dlm_ls *ls) e = list_entry(ls->ls_requestqueue.next, struct rq_entry, list);mutex_unlock (&ls->ls_requestqueue_mutex); -dlm_receive_message_saved (ls, (struct dlm_message *)e->request); +dlm_receive_message_saved (ls, &e->request);mutex_lock (&ls->ls_requestqueue_mutex);list_del (&e->list);
@@ -176,7 +176,7 @@ void dlm_purge_requestqueue(struct dlm_ls *ls)mutex_lock (&ls->ls_requestqueue_mutex);list_for_each_entry_safe (e, safe, &ls->ls_requestqueue, list) { - ms = (struct dlm_message *) e->request; + ms = &e->request;if (purge_request (ls, ms, e->nodeid)) {list_del (&e->list);
fs/dlm/requestqueue.h +1 -1
@@ -13,7 +13,7 @@#ifndef __REQUESTQUEUE_DOT_H__#define __REQUESTQUEUE_DOT_H__ -void dlm_add_requestqueue (struct dlm_ls *ls,int nodeid,struct dlm_header *hd); +void dlm_add_requestqueue (struct dlm_ls *ls,int nodeid,struct dlm_message *ms);int dlm_process_requestqueue (struct dlm_ls *ls);void dlm_wait_requestqueue (struct dlm_ls *ls);void dlm_purge_requestqueue (struct dlm_ls *ls);
Signature · 1 line
1.5.3.3