[Ocfs2-commits] mfasheh commits r1981 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-03-15 22:38:57 -0600 (Tue, 15 Mar 2005)
New Revision: 1981

Modified:
   trunk/fs/ocfs2/cluster/tcp.c
Log:
* fix up the error code return code in net_process_message

Signed-off-by: zab



Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c	2005-03-16 00:31:47 UTC (rev 1980)
+++ trunk/fs/ocfs2/cluster/tcp.c	2005-03-16 04:38:57 UTC (rev 1981)
@@ -1101,7 +1101,7 @@
  * after this is called the buffer us reused for the next message */
 static int net_process_message(struct socket *sock, net_msg *hdr)
 {
-	int ret, tmpret;
+	int ret, handler_status;
 	enum net_system_error syserr;
 	net_msg_handler *hnd = NULL;
 
@@ -1132,6 +1132,7 @@
 
 	/* find a handler for it */
 	ret = 0;
+	handler_status = 0;
 	hnd = net_lookup_handler(hdr->msg_type, hdr->key);
 	if (!hnd) {
 		syserr = NET_ERR_NO_HNDLR;
@@ -1149,14 +1150,14 @@
 		goto out_respond;
 
 	net_num_dispatched++;
-	ret = (hnd->func)(hdr, sizeof(net_msg) + hdr->data_len, hnd->data);
+	handler_status = (hnd->func)(hdr, sizeof(net_msg) + hdr->data_len, hnd->data);
 
 out_respond:
 	/* this destroys the hdr, so don't use it after this */
-	tmpret = net_send_status_magic(sock, hdr, syserr, ret);
+	ret = net_send_status_magic(sock, hdr, syserr, handler_status);
 	hdr = NULL;
-	netprintk("sending status %d, syserr %d returned %d\n", ret, syserr,
-		  tmpret);
+	netprintk("sending handler status %d, syserr %d returned %d\n",
+		  handler_status, syserr, ret);
 
 out:
 	if (hnd)