* qswnal descriptor leak fix

*   socknal Makefile.am fix

diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c
index ede36d1..8d5f70b 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd_cb.c
+++ b/lnet/klnds/qswlnd/qswlnd_cb.c
@@ -674,6 +674,7 @@ kqswnal_sendmsg (nal_cb_t     *nal,
         rc = kqswnal_launch (ktx);
         if (rc != 0) {                    /* failed? */
                 CERROR ("Failed to send packet to "LPX64": %d\n", nid, rc);
+                kqswnal_put_idle_tx (ktx);
                 return (PTL_FAIL);
         }
 

diff --git a/lnet/klnds/socklnd/Makefile.am b/lnet/klnds/socklnd/Makefile.am
index d6c717c..acdba5e 100644 (file)
--- a/lnet/klnds/socklnd/Makefile.am
+++ b/lnet/klnds/socklnd/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_PROGRAMS = ksocknal
 
 # If you don't build with -O2, your modules won't insert, becahse htonl is
 # just special that way.
-CFLAGS += -O2
+AM_CFLAGS = -O2
 
 DEFS =
 ksocknal_SOURCES = socknal.c socknal_cb.c socknal.h

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 2efee5b..192b15c 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -916,7 +916,7 @@ static void cleanup_obdclass(void)
  * kernel patch */
 #ifdef __KERNEL__
 #include <linux/lustre_version.h>
-#define LUSTRE_MIN_VERSION 23
+#define LUSTRE_MIN_VERSION 21
 #define LUSTRE_MAX_VERSION 23
 #if (LUSTRE_KERNEL_VERSION < LUSTRE_MIN_VERSION)
 # error Cannot continue: Your Lustre kernel patch is older than the sources

diff --git a/lustre/portals/knals/qswnal/qswnal_cb.c b/lustre/portals/knals/qswnal/qswnal_cb.c
index ede36d1..8d5f70b 100644 (file)
--- a/lustre/portals/knals/qswnal/qswnal_cb.c
+++ b/lustre/portals/knals/qswnal/qswnal_cb.c
@@ -674,6 +674,7 @@ kqswnal_sendmsg (nal_cb_t     *nal,
         rc = kqswnal_launch (ktx);
         if (rc != 0) {                    /* failed? */
                 CERROR ("Failed to send packet to "LPX64": %d\n", nid, rc);
+                kqswnal_put_idle_tx (ktx);
                 return (PTL_FAIL);
         }
 

diff --git a/lustre/portals/knals/socknal/Makefile.am b/lustre/portals/knals/socknal/Makefile.am
index d6c717c..acdba5e 100644 (file)
--- a/lustre/portals/knals/socknal/Makefile.am
+++ b/lustre/portals/knals/socknal/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_PROGRAMS = ksocknal
 
 # If you don't build with -O2, your modules won't insert, becahse htonl is
 # just special that way.
-CFLAGS += -O2
+AM_CFLAGS = -O2
 
 DEFS =
 ksocknal_SOURCES = socknal.c socknal_cb.c socknal.h