[Ocfs2-commits] jlbec commits r2686 - in
branches/enotypedefs/fs/ocfs2: . cluster dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Nov 8 16:50:14 CST 2005
Author: jlbec
Date: 2005-11-08 16:50:10 -0600 (Tue, 08 Nov 2005)
New Revision: 2686
Modified:
branches/enotypedefs/fs/ocfs2/cluster/tcp.c
branches/enotypedefs/fs/ocfs2/cluster/tcp.h
branches/enotypedefs/fs/ocfs2/dlm/dlmast.c
branches/enotypedefs/fs/ocfs2/dlm/dlmcommon.h
branches/enotypedefs/fs/ocfs2/dlm/dlmconvert.c
branches/enotypedefs/fs/ocfs2/dlm/dlmdomain.c
branches/enotypedefs/fs/ocfs2/dlm/dlmlock.c
branches/enotypedefs/fs/ocfs2/dlm/dlmmaster.c
branches/enotypedefs/fs/ocfs2/dlm/dlmrecovery.c
branches/enotypedefs/fs/ocfs2/dlm/dlmunlock.c
branches/enotypedefs/fs/ocfs2/vote.c
Log:
o Remove the o2net_msg typedef.
Modified: branches/enotypedefs/fs/ocfs2/cluster/tcp.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/cluster/tcp.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/cluster/tcp.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -131,7 +131,7 @@
#define O2NET_HB_PRI 0x1
static struct o2net_handshake *o2net_hand;
-static o2net_msg *o2net_keep_req, *o2net_keep_resp;
+static struct o2net_msg *o2net_keep_req, *o2net_keep_resp;
static int o2net_sys_err_translations[O2NET_ERR_MAX] =
{[O2NET_ERR_NONE] = 0,
@@ -838,9 +838,9 @@
}
}
-static void o2net_init_msg(o2net_msg *msg, u16 data_len, u16 msg_type, u32 key)
+static void o2net_init_msg(struct o2net_msg *msg, u16 data_len, u16 msg_type, u32 key)
{
- memset(msg, 0, sizeof(o2net_msg));
+ memset(msg, 0, sizeof(struct o2net_msg));
msg->magic = cpu_to_be16(O2NET_MSG_MAGIC);
msg->data_len = cpu_to_be16(data_len);
msg->msg_type = cpu_to_be16(msg_type);
@@ -876,7 +876,7 @@
size_t caller_veclen, u8 target_node, int *status)
{
int ret, error = 0;
- o2net_msg *msg = NULL;
+ struct o2net_msg *msg = NULL;
size_t veclen, caller_bytes = 0;
struct kvec *vec = NULL;
struct o2net_sock_container *sc = NULL;
@@ -924,7 +924,7 @@
goto out;
}
- msg = kmalloc(sizeof(o2net_msg), GFP_ATOMIC);
+ msg = kmalloc(sizeof(struct o2net_msg), GFP_ATOMIC);
if (!msg) {
mlog(0, "failed to allocate a o2net_msg!\n");
ret = -ENOMEM;
@@ -933,7 +933,7 @@
o2net_init_msg(msg, caller_bytes, msg_type, key);
- vec[0].iov_len = sizeof(o2net_msg);
+ vec[0].iov_len = sizeof(struct o2net_msg);
vec[0].iov_base = msg;
memcpy(&vec[1], caller_vec, caller_veclen * sizeof(struct kvec));
@@ -946,7 +946,7 @@
/* finally, convert the message header to network byte-order
* and send */
ret = o2net_send_tcp_msg(sc->sc_sock, vec, veclen,
- sizeof(o2net_msg) + caller_bytes);
+ sizeof(struct o2net_msg) + caller_bytes);
msglog(msg, "sending returned %d\n", ret);
if (ret < 0) {
mlog(0, "error returned from o2net_send_tcp_msg=%d\n", ret);
@@ -989,12 +989,12 @@
}
EXPORT_SYMBOL_GPL(o2net_send_message);
-static int o2net_send_status_magic(struct socket *sock, o2net_msg *hdr,
+static int o2net_send_status_magic(struct socket *sock, struct o2net_msg *hdr,
enum o2net_system_error syserr, int err)
{
struct kvec vec = {
.iov_base = hdr,
- .iov_len = sizeof(o2net_msg),
+ .iov_len = sizeof(struct o2net_msg),
};
BUG_ON(syserr >= O2NET_ERR_MAX);
@@ -1008,13 +1008,13 @@
msglog(hdr, "about to send status magic %d\n", err);
/* hdr has been in host byteorder this whole time */
- return o2net_send_tcp_msg(sock, &vec, 1, sizeof(o2net_msg));
+ return o2net_send_tcp_msg(sock, &vec, 1, sizeof(struct o2net_msg));
}
/* this returns -errno if the header was unknown or too large, etc.
* after this is called the buffer us reused for the next message */
static int o2net_process_message(struct o2net_sock_container *sc,
- o2net_msg *hdr)
+ struct o2net_msg *hdr)
{
struct o2net_node *nn = o2net_nn_from_num(sc->sc_node->nd_num);
int ret = 0, handler_status;
@@ -1070,7 +1070,7 @@
do_gettimeofday(&sc->sc_tv_func_start);
sc->sc_msg_key = be32_to_cpu(hdr->key);
sc->sc_msg_type = be16_to_cpu(hdr->msg_type);
- handler_status = (nmh->nh_func)(hdr, sizeof(o2net_msg) +
+ handler_status = (nmh->nh_func)(hdr, sizeof(struct o2net_msg) +
be16_to_cpu(hdr->data_len),
nmh->nh_func_data);
do_gettimeofday(&sc->sc_tv_func_stop);
@@ -1130,7 +1130,7 @@
* == 0 eof, or > 0 for progress made.*/
static int o2net_advance_rx(struct o2net_sock_container *sc)
{
- o2net_msg *hdr;
+ struct o2net_msg *hdr;
int ret = 0;
void *data;
size_t datalen;
@@ -1139,9 +1139,9 @@
do_gettimeofday(&sc->sc_tv_advance_start);
/* do we need more header? */
- if (sc->sc_page_off < sizeof(o2net_msg)) {
+ if (sc->sc_page_off < sizeof(struct o2net_msg)) {
data = page_address(sc->sc_page) + sc->sc_page_off;
- datalen = sizeof(o2net_msg) - sc->sc_page_off;
+ datalen = sizeof(struct o2net_msg) - sc->sc_page_off;
ret = o2net_recv_tcp_msg(sc->sc_sock, data, datalen);
if (ret > 0) {
sc->sc_page_off += ret;
@@ -1157,7 +1157,7 @@
/* only swab incoming here.. we can
* only get here once as we cross from
* being under to over */
- if (sc->sc_page_off == sizeof(o2net_msg)) {
+ if (sc->sc_page_off == sizeof(struct o2net_msg)) {
hdr = page_address(sc->sc_page);
if (be16_to_cpu(hdr->data_len) >
O2NET_MAX_PAYLOAD_BYTES)
@@ -1168,7 +1168,7 @@
goto out;
}
- if (sc->sc_page_off < sizeof(o2net_msg)) {
+ if (sc->sc_page_off < sizeof(struct o2net_msg)) {
/* oof, still don't have a header */
goto out;
}
@@ -1179,10 +1179,10 @@
msglog(hdr, "at page_off %zu\n", sc->sc_page_off);
/* do we need more payload? */
- if (sc->sc_page_off - sizeof(o2net_msg) < be16_to_cpu(hdr->data_len)) {
+ if (sc->sc_page_off - sizeof(struct o2net_msg) < be16_to_cpu(hdr->data_len)) {
/* need more payload */
data = page_address(sc->sc_page) + sc->sc_page_off;
- datalen = (sizeof(o2net_msg) + be16_to_cpu(hdr->data_len)) -
+ datalen = (sizeof(struct o2net_msg) + be16_to_cpu(hdr->data_len)) -
sc->sc_page_off;
ret = o2net_recv_tcp_msg(sc->sc_sock, data, datalen);
if (ret > 0)
@@ -1191,7 +1191,7 @@
goto out;
}
- if (sc->sc_page_off - sizeof(o2net_msg) == be16_to_cpu(hdr->data_len)) {
+ if (sc->sc_page_off - sizeof(struct o2net_msg) == be16_to_cpu(hdr->data_len)) {
/* we can only get here once, the first time we read
* the payload.. so set ret to progress if the handler
* works out. after calling this the message is toast */
@@ -1813,8 +1813,8 @@
o2quo_init();
o2net_hand = kcalloc(1, sizeof(struct o2net_handshake), GFP_KERNEL);
- o2net_keep_req = kcalloc(1, sizeof(o2net_msg), GFP_KERNEL);
- o2net_keep_resp = kcalloc(1, sizeof(o2net_msg), GFP_KERNEL);
+ o2net_keep_req = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
+ o2net_keep_resp = kcalloc(1, sizeof(struct o2net_msg), GFP_KERNEL);
if (!o2net_hand || !o2net_keep_req || !o2net_keep_resp) {
kfree(o2net_hand);
kfree(o2net_keep_req);
Modified: branches/enotypedefs/fs/ocfs2/cluster/tcp.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/cluster/tcp.h 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/cluster/tcp.h 2005-11-08 22:50:10 UTC (rev 2686)
@@ -37,7 +37,7 @@
#include <linux/inet.h>
#include <linux/in.h>
-typedef struct _o2net_msg
+struct o2net_msg
{
__be16 magic;
__be16 data_len;
@@ -48,11 +48,11 @@
__be32 key;
__be32 msg_num;
__u8 buf[0];
-} o2net_msg;
+};
-typedef int (o2net_msg_handler_func)(o2net_msg *msg, u32 len, void *data);
+typedef int (o2net_msg_handler_func)(struct o2net_msg *msg, u32 len, void *data);
-#define O2NET_MAX_PAYLOAD_BYTES (4096 - sizeof(o2net_msg))
+#define O2NET_MAX_PAYLOAD_BYTES (4096 - sizeof(struct o2net_msg))
/* TODO: figure this out.... */
static inline int o2net_link_down(int err, struct socket *sock)
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmast.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmast.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmast.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -248,7 +248,7 @@
-int dlm_proxy_ast_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data)
{
int ret;
unsigned int locklen;
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmcommon.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmcommon.h 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmcommon.h 2005-11-08 22:50:10 UTC (rev 2686)
@@ -637,16 +637,16 @@
void dlm_lock_attach_lockres(struct dlm_lock *lock,
struct dlm_lock_resource *res);
-int dlm_create_lock_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_convert_lock_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_proxy_ast_handler(o2net_msg *msg, u32 len, void *data);
+int dlm_create_lock_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data);
void dlm_revert_pending_convert(struct dlm_lock_resource *res,
struct dlm_lock *lock);
void dlm_revert_pending_lock(struct dlm_lock_resource *res,
struct dlm_lock *lock);
-int dlm_unlock_lock_handler(o2net_msg *msg, u32 len, void *data);
+int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data);
void dlm_commit_pending_cancel(struct dlm_lock_resource *res,
struct dlm_lock *lock);
void dlm_commit_pending_unlock(struct dlm_lock_resource *res,
@@ -750,15 +750,15 @@
struct dlm_lock_resource *res);
void __dlm_lockres_reserve_ast(struct dlm_lock_resource *res);
-int dlm_master_request_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_assert_master_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_migrate_request_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_mig_lockres_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_master_requery_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_request_all_locks_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_reco_data_done_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_begin_reco_handler(o2net_msg *msg, u32 len, void *data);
-int dlm_finalize_reco_handler(o2net_msg *msg, u32 len, void *data);
+int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_migrate_request_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_reco_data_done_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data);
+int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data);
int dlm_dispatch_assert_master(struct dlm_ctxt *dlm,
struct dlm_lock_resource *res,
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmconvert.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmconvert.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -411,7 +411,7 @@
* returns: DLM_NORMAL, DLM_IVLOCKID, DLM_BADARGS,
* status from __dlmconvert_master
*/
-int dlm_convert_lock_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_convert_lock *cnv = (struct dlm_convert_lock *)msg->buf;
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmdomain.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmdomain.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmdomain.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -68,10 +68,10 @@
#define DLM_DOMAIN_BACKOFF_MS 200
-static int dlm_query_join_handler(o2net_msg *msg, u32 len, void *data);
-static int dlm_assert_joined_handler(o2net_msg *msg, u32 len, void *data);
-static int dlm_cancel_join_handler(o2net_msg *msg, u32 len, void *data);
-static int dlm_exit_domain_handler(o2net_msg *msg, u32 len, void *data);
+static int dlm_query_join_handler(struct o2net_msg *msg, u32 len, void *data);
+static int dlm_assert_joined_handler(struct o2net_msg *msg, u32 len, void *data);
+static int dlm_cancel_join_handler(struct o2net_msg *msg, u32 len, void *data);
+static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data);
static void dlm_unregister_domain_handlers(struct dlm_ctxt *dlm);
@@ -378,7 +378,7 @@
}
}
-static int dlm_exit_domain_handler(o2net_msg *msg, u32 len, void *data)
+static int dlm_exit_domain_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
unsigned int node;
@@ -540,7 +540,7 @@
}
EXPORT_SYMBOL_GPL(dlm_unregister_domain);
-static int dlm_query_join_handler(o2net_msg *msg, u32 len, void *data)
+static int dlm_query_join_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_query_join_request *query;
enum dlm_query_join_response response;
@@ -601,7 +601,7 @@
return response;
}
-static int dlm_assert_joined_handler(o2net_msg *msg, u32 len, void *data)
+static int dlm_assert_joined_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_assert_joined *assert;
struct dlm_ctxt *dlm = NULL;
@@ -636,7 +636,7 @@
return 0;
}
-static int dlm_cancel_join_handler(o2net_msg *msg, u32 len, void *data)
+static int dlm_cancel_join_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_cancel_join *cancel;
struct dlm_ctxt *dlm = NULL;
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmlock.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmlock.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmlock.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -389,7 +389,7 @@
* held on exit: none
* returns: DLM_NORMAL, DLM_SYSERR, DLM_IVLOCKID, DLM_NOTQUEUED
*/
-int dlm_create_lock_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_create_lock_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_create_lock *create = (struct dlm_create_lock *)msg->buf;
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmmaster.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmmaster.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -1228,7 +1228,7 @@
*
* if possible, TRIM THIS DOWN!!!
*/
-int dlm_master_request_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data)
{
u8 response = DLM_MASTER_RESP_MAYBE;
struct dlm_ctxt *dlm = data;
@@ -1507,7 +1507,7 @@
*
* if possible, TRIM THIS DOWN!!!
*/
-int dlm_assert_master_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_master_list_entry *mle = NULL;
@@ -2270,7 +2270,7 @@
* we will have no mle in the list to start with. now we can add an mle for
* the migration and this should be the only one found for those scanning the
* list. */
-int dlm_migrate_request_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_migrate_request_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_lock_resource *res = NULL;
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmrecovery.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmrecovery.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -618,7 +618,7 @@
}
-int dlm_request_all_locks_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_lock_request *lr = (struct dlm_lock_request *)msg->buf;
@@ -726,7 +726,7 @@
}
-int dlm_reco_data_done_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_reco_data_done_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_reco_data_done *done = (struct dlm_reco_data_done *)msg->buf;
@@ -1012,7 +1012,7 @@
* do we spin? returning an error only delays the problem really
*/
-int dlm_mig_lockres_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_migratable_lockres *mres =
@@ -1292,7 +1292,7 @@
/* this function cannot error, so unless the sending
* or receiving of the message failed, the owner can
* be trusted */
-int dlm_master_requery_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_master_requery *req = (struct dlm_master_requery *)msg->buf;
@@ -1996,7 +1996,7 @@
return ret;
}
-int dlm_begin_reco_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_begin_reco *br = (struct dlm_begin_reco *)msg->buf;
@@ -2069,7 +2069,7 @@
return ret;
}
-int dlm_finalize_reco_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_finalize_reco *fr = (struct dlm_finalize_reco *)msg->buf;
Modified: branches/enotypedefs/fs/ocfs2/dlm/dlmunlock.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/dlm/dlmunlock.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/dlm/dlmunlock.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -362,7 +362,7 @@
* returns: DLM_NORMAL, DLM_BADARGS, DLM_IVLOCKID,
* return value from dlmunlock_master
*/
-int dlm_unlock_lock_handler(o2net_msg *msg, u32 len, void *data)
+int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data)
{
struct dlm_ctxt *dlm = data;
struct dlm_unlock_lock *unlock = (struct dlm_unlock_lock *)msg->buf;
Modified: branches/enotypedefs/fs/ocfs2/vote.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/vote.c 2005-11-08 22:27:18 UTC (rev 2685)
+++ branches/enotypedefs/fs/ocfs2/vote.c 2005-11-08 22:50:10 UTC (rev 2686)
@@ -1076,7 +1076,7 @@
return ret;
}
-static int ocfs2_handle_response_message(o2net_msg *msg,
+static int ocfs2_handle_response_message(struct o2net_msg *msg,
u32 len,
void *data)
{
@@ -1131,7 +1131,7 @@
return 0;
}
-static int ocfs2_handle_vote_message(o2net_msg *msg,
+static int ocfs2_handle_vote_message(struct o2net_msg *msg,
u32 len,
void *data)
{
More information about the Ocfs2-commits
mailing list