arm: imx6: defconfig: update tx6 defconfigs

[karo-tx-linux.git] / fs / dlm / util.c

diff --git a/fs/dlm/util.c b/fs/dlm/util.c
index 11c6a456309f87b22db038c81ed73ff37f9b3961..e36520af7cc0e75f8eab5ca649cf8b01a64ad674 100644 (file)
--- a/fs/dlm/util.c
+++ b/fs/dlm/util.c
@@ -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,
 **  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)
 {
-       struct dlm_header *hd = (struct dlm_header *) ms;
-
-       header_out(hd);
+       header_out(&ms->m_header);
 
        ms->m_type              = cpu_to_le32(ms->m_type);
        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)
 {
-       struct dlm_header *hd = (struct dlm_header *) ms;
-
-       header_in(hd);
+       header_in(&ms->m_header);
 
        ms->m_type              = le32_to_cpu(ms->m_type);
        ms->m_nodeid            = le32_to_cpu(ms->m_nodeid);
@@ -135,87 +131,24 @@ void dlm_message_in(struct dlm_message *ms)
        ms->m_result            = from_dlm_errno(le32_to_cpu(ms->m_result));
 }
 
-static void rcom_lock_out(struct rcom_lock *rl)
-{
-       rl->rl_ownpid           = cpu_to_le32(rl->rl_ownpid);
-       rl->rl_lkid             = cpu_to_le32(rl->rl_lkid);
-       rl->rl_remid            = cpu_to_le32(rl->rl_remid);
-       rl->rl_parent_lkid      = cpu_to_le32(rl->rl_parent_lkid);
-       rl->rl_parent_remid     = cpu_to_le32(rl->rl_parent_remid);
-       rl->rl_exflags          = cpu_to_le32(rl->rl_exflags);
-       rl->rl_flags            = cpu_to_le32(rl->rl_flags);
-       rl->rl_lvbseq           = cpu_to_le32(rl->rl_lvbseq);
-       rl->rl_result           = cpu_to_le32(rl->rl_result);
-       rl->rl_wait_type        = cpu_to_le16(rl->rl_wait_type);
-       rl->rl_namelen          = cpu_to_le16(rl->rl_namelen);
-}
-
-static void rcom_lock_in(struct rcom_lock *rl)
-{
-       rl->rl_ownpid           = le32_to_cpu(rl->rl_ownpid);
-       rl->rl_lkid             = le32_to_cpu(rl->rl_lkid);
-       rl->rl_remid            = le32_to_cpu(rl->rl_remid);
-       rl->rl_parent_lkid      = le32_to_cpu(rl->rl_parent_lkid);
-       rl->rl_parent_remid     = le32_to_cpu(rl->rl_parent_remid);
-       rl->rl_exflags          = le32_to_cpu(rl->rl_exflags);
-       rl->rl_flags            = le32_to_cpu(rl->rl_flags);
-       rl->rl_lvbseq           = le32_to_cpu(rl->rl_lvbseq);
-       rl->rl_result           = le32_to_cpu(rl->rl_result);
-       rl->rl_wait_type        = le16_to_cpu(rl->rl_wait_type);
-       rl->rl_namelen          = le16_to_cpu(rl->rl_namelen);
-}
-
-static void rcom_config_out(struct rcom_config *rf)
-{
-       rf->rf_lvblen           = cpu_to_le32(rf->rf_lvblen);
-       rf->rf_lsflags          = cpu_to_le32(rf->rf_lsflags);
-}
-
-static void rcom_config_in(struct rcom_config *rf)
-{
-       rf->rf_lvblen           = le32_to_cpu(rf->rf_lvblen);
-       rf->rf_lsflags          = le32_to_cpu(rf->rf_lsflags);
-}
-
 void dlm_rcom_out(struct dlm_rcom *rc)
 {
-       struct dlm_header *hd = (struct dlm_header *) rc;
-       int type = rc->rc_type;
-
-       header_out(hd);
+       header_out(&rc->rc_header);
 
        rc->rc_type             = cpu_to_le32(rc->rc_type);
        rc->rc_result           = cpu_to_le32(rc->rc_result);
        rc->rc_id               = cpu_to_le64(rc->rc_id);
        rc->rc_seq              = cpu_to_le64(rc->rc_seq);
        rc->rc_seq_reply        = cpu_to_le64(rc->rc_seq_reply);
-
-       if ((type == DLM_RCOM_LOCK) || (type == DLM_RCOM_LOCK_REPLY))
-               rcom_lock_out((struct rcom_lock *) rc->rc_buf);
-
-       else if (type == DLM_RCOM_STATUS_REPLY)
-               rcom_config_out((struct rcom_config *) rc->rc_buf);
 }
 
 void dlm_rcom_in(struct dlm_rcom *rc)
 {
-       struct dlm_header *hd = (struct dlm_header *) rc;
-       int type;
-
-       header_in(hd);
+       header_in(&rc->rc_header);
 
        rc->rc_type             = le32_to_cpu(rc->rc_type);
        rc->rc_result           = le32_to_cpu(rc->rc_result);
        rc->rc_id               = le64_to_cpu(rc->rc_id);
        rc->rc_seq              = le64_to_cpu(rc->rc_seq);
        rc->rc_seq_reply        = le64_to_cpu(rc->rc_seq_reply);
-
-       type = rc->rc_type;
-
-       if ((type == DLM_RCOM_LOCK) || (type == DLM_RCOM_LOCK_REPLY))
-               rcom_lock_in((struct rcom_lock *) rc->rc_buf);
-
-       else if (type == DLM_RCOM_STATUS_REPLY)
-               rcom_config_in((struct rcom_config *) rc->rc_buf);
 }
-