From: ericm <ericm>
Date: Thu, 14 Aug 2003 07:04:43 +0000 (+0000)
Subject: [tcpnal]:
X-Git-Tag: v1_7_0_51~2^9~357
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=95281d3991ec0ac682e6e75619e3369a4d8bc228;p=fs%2Flustre-release.git

[tcpnal]:
  tcpnal_recv() need call lib_finalize() even the message size
  is 0, e.g. ACK. hit by TianYing.
---

diff --git a/lnet/ulnds/socklnd/tcplnd.c b/lnet/ulnds/socklnd/tcplnd.c
index 5854b01..7c7c94d 100644
--- a/lnet/ulnds/socklnd/tcplnd.c
+++ b/lnet/ulnds/socklnd/tcplnd.c
@@ -123,7 +123,7 @@ int tcpnal_recv(nal_cb_t *n,
     int i;
 
     if (!niov)
-            goto check_len;
+            goto finalize;
 
     LASSERT(mlen);
     LASSERT(rlen);
@@ -136,9 +136,10 @@ int tcpnal_recv(nal_cb_t *n,
      */
     for (i = 0; i < niov; i++)
         read_connection(private, iov[i].iov_base, iov[i].iov_len);
+
+finalize:
     lib_finalize(n, private, cookie);
 
-check_len:
     if (mlen!=rlen){
         char *trash=malloc(rlen-mlen);
         
diff --git a/lnet/ulnds/tcplnd.c b/lnet/ulnds/tcplnd.c
index 5854b01..7c7c94d 100644
--- a/lnet/ulnds/tcplnd.c
+++ b/lnet/ulnds/tcplnd.c
@@ -123,7 +123,7 @@ int tcpnal_recv(nal_cb_t *n,
     int i;
 
     if (!niov)
-            goto check_len;
+            goto finalize;
 
     LASSERT(mlen);
     LASSERT(rlen);
@@ -136,9 +136,10 @@ int tcpnal_recv(nal_cb_t *n,
      */
     for (i = 0; i < niov; i++)
         read_connection(private, iov[i].iov_base, iov[i].iov_len);
+
+finalize:
     lib_finalize(n, private, cookie);
 
-check_len:
     if (mlen!=rlen){
         char *trash=malloc(rlen-mlen);
         
diff --git a/lustre/portals/unals/tcpnal.c b/lustre/portals/unals/tcpnal.c
index 5854b01..7c7c94d 100644
--- a/lustre/portals/unals/tcpnal.c
+++ b/lustre/portals/unals/tcpnal.c
@@ -123,7 +123,7 @@ int tcpnal_recv(nal_cb_t *n,
     int i;
 
     if (!niov)
-            goto check_len;
+            goto finalize;
 
     LASSERT(mlen);
     LASSERT(rlen);
@@ -136,9 +136,10 @@ int tcpnal_recv(nal_cb_t *n,
      */
     for (i = 0; i < niov; i++)
         read_connection(private, iov[i].iov_base, iov[i].iov_len);
+
+finalize:
     lib_finalize(n, private, cookie);
 
-check_len:
     if (mlen!=rlen){
         char *trash=malloc(rlen-mlen);