From: adilger <adilger>
Date: Fri, 30 Jan 2004 23:28:47 +0000 (+0000)
Subject: Update b_orphan from HEAD (20040130_1601) in preparation for landing.
X-Git-Tag: v1_7_0_51~2^20~21
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=63bff8053f2702f5deb0449fd51f8672cd2ae1cf;p=fs%2Flustre-release.git

Update b_orphan from HEAD (20040130_1601) in preparation for landing.
---

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 985b432..45a1508 100644
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2271,7 +2271,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                 goto out;
         }
 
-        if (route->ksnr_nonagel) {
+        {
                 int  option = 1;
                 
                 set_fs (KERNEL_DS);
@@ -2279,7 +2279,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                                             (char *)&option, sizeof (option));
                 set_fs (oldmm);
                 if (rc != 0) {
-                        CERROR ("Can't disable nagel: %d\n", rc);
+                        CERROR ("Can't disable nagle: %d\n", rc);
                         goto out;
                 }
         }
diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c
index 985b432..45a1508 100644
--- a/lustre/portals/knals/socknal/socknal_cb.c
+++ b/lustre/portals/knals/socknal/socknal_cb.c
@@ -2271,7 +2271,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                 goto out;
         }
 
-        if (route->ksnr_nonagel) {
+        {
                 int  option = 1;
                 
                 set_fs (KERNEL_DS);
@@ -2279,7 +2279,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                                             (char *)&option, sizeof (option));
                 set_fs (oldmm);
                 if (rc != 0) {
-                        CERROR ("Can't disable nagel: %d\n", rc);
+                        CERROR ("Can't disable nagle: %d\n", rc);
                         goto out;
                 }
         }