Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

dlm: clean ups

Browse Source 
A couple small clean-ups.  Remove unnecessary wrapper-functions in
rcom.c, and remove unnecessary casting and an unnecessary ASSERT in
util.c.

Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
David Teigland 2008-01-29 14:52:10 -06:00
parent 2a79289e87
commit dbcfc34733
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/dlm/rcom.c
View File

@ -2,7 +2,7 @@
******************************************************************************* *******************************************************************************
** **
** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. ** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
** Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. ** Copyright (C) 2005-2008 Red Hat, Inc. All rights reserved.
** **
** This copyrighted material is made available to anyone wishing to use, ** This copyrighted material is made available to anyone wishing to use,
** modify, copy, or redistribute it subject to the terms and conditions ** modify, copy, or redistribute it subject to the terms and conditions
@ -197,11 +197,6 @@ static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
spin_unlock(&ls->ls_rcom_spin); spin_unlock(&ls->ls_rcom_spin);
} }
static void receive_rcom_status_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
{
receive_sync_reply(ls, rc_in);
}
int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len) int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
{ {
struct dlm_rcom *rc; struct dlm_rcom *rc;
@ -254,11 +249,6 @@ static void receive_rcom_names(struct dlm_ls *ls, struct dlm_rcom *rc_in)
send_rcom(ls, mh, rc); send_rcom(ls, mh, rc);
} }
static void receive_rcom_names_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
{
receive_sync_reply(ls, rc_in);
}
int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid) int dlm_send_rcom_lookup(struct dlm_rsb *r, int dir_nodeid)
{ {
struct dlm_rcom *rc; struct dlm_rcom *rc;
@ -381,11 +371,6 @@ static void receive_rcom_lock(struct dlm_ls *ls, struct dlm_rcom *rc_in)
send_rcom(ls, mh, rc); send_rcom(ls, mh, rc);
} }
static void receive_rcom_lock_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in)
{
dlm_recover_process_copy(ls, rc_in);
}
/* If the lockspace doesn't exist then still send a status message /* If the lockspace doesn't exist then still send a status message
back; it's possible that it just doesn't have its global_id yet. */ back; it's possible that it just doesn't have its global_id yet. */
@ -481,11 +466,11 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
break; break;
case DLM_RCOM_STATUS_REPLY: case DLM_RCOM_STATUS_REPLY:
receive_rcom_status_reply(ls, rc); receive_sync_reply(ls, rc);
break; break;
case DLM_RCOM_NAMES_REPLY: case DLM_RCOM_NAMES_REPLY:
receive_rcom_names_reply(ls, rc); receive_sync_reply(ls, rc);
break; break;
case DLM_RCOM_LOOKUP_REPLY: case DLM_RCOM_LOOKUP_REPLY:
@ -493,11 +478,11 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
break; break;
case DLM_RCOM_LOCK_REPLY: case DLM_RCOM_LOCK_REPLY:
receive_rcom_lock_reply(ls, rc); dlm_recover_process_copy(ls, rc);
break; break;
default: default:
DLM_ASSERT(0, printk("rc_type=%x\n", rc->rc_type);); log_error(ls, "receive_rcom bad type %d", rc->rc_type);
} }
out: out:
return; return;

16
fs/dlm/util.c
View File

@ -1,7 +1,7 @@
/****************************************************************************** /******************************************************************************
******************************************************************************* *******************************************************************************
** **
** Copyright (C) 2005 Red Hat, Inc. All rights reserved. ** Copyright (C) 2005-2008 Red Hat, Inc. All rights reserved.
** **
** This copyrighted material is made available to anyone wishing to use, ** This copyrighted material is made available to anyone wishing to use,
** modify, copy, or redistribute it subject to the terms and conditions ** modify, copy, or redistribute it subject to the terms and conditions
@ -85,9 +85,7 @@ static int from_dlm_errno(int err)
void dlm_message_out(struct dlm_message *ms) void dlm_message_out(struct dlm_message *ms)
{ {
struct dlm_header *hd = (struct dlm_header *) ms; header_out(&ms->m_header);
header_out(hd);
ms->m_type = cpu_to_le32(ms->m_type); ms->m_type = cpu_to_le32(ms->m_type);
ms->m_nodeid = cpu_to_le32(ms->m_nodeid); ms->m_nodeid = cpu_to_le32(ms->m_nodeid);
@ -111,9 +109,7 @@ void dlm_message_out(struct dlm_message *ms)
void dlm_message_in(struct dlm_message *ms) void dlm_message_in(struct dlm_message *ms)
{ {
struct dlm_header *hd = (struct dlm_header *) ms; header_in(&ms->m_header);
header_in(hd);
ms->m_type = le32_to_cpu(ms->m_type); ms->m_type = le32_to_cpu(ms->m_type);
ms->m_nodeid = le32_to_cpu(ms->m_nodeid); ms->m_nodeid = le32_to_cpu(ms->m_nodeid);
@ -179,10 +175,9 @@ static void rcom_config_in(struct rcom_config *rf)
void dlm_rcom_out(struct dlm_rcom *rc) void dlm_rcom_out(struct dlm_rcom *rc)
{ {
struct dlm_header *hd = (struct dlm_header *) rc;
int type = rc->rc_type; int type = rc->rc_type;
header_out(hd); header_out(&rc->rc_header);
rc->rc_type = cpu_to_le32(rc->rc_type); rc->rc_type = cpu_to_le32(rc->rc_type);
rc->rc_result = cpu_to_le32(rc->rc_result); rc->rc_result = cpu_to_le32(rc->rc_result);
@ -199,10 +194,9 @@ void dlm_rcom_out(struct dlm_rcom *rc)
void dlm_rcom_in(struct dlm_rcom *rc) void dlm_rcom_in(struct dlm_rcom *rc)
{ {
struct dlm_header *hd = (struct dlm_header *) rc;
int type; int type;
header_in(hd); header_in(&rc->rc_header);
rc->rc_type = le32_to_cpu(rc->rc_type); rc->rc_type = le32_to_cpu(rc->rc_type);
rc->rc_result = le32_to_cpu(rc->rc_result); rc->rc_result = le32_to_cpu(rc->rc_result);