Update from HEAD

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 64278c6..985b432 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2137,7 +2137,11 @@ ksocknal_setup_sock (struct socket *sock)
         int             option;
         struct linger   linger;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+        sock->sk->sk_allocation = GFP_NOFS;
+#else
         sock->sk->allocation = GFP_NOFS;
+#endif
 
         /* Ensure this socket aborts active sends immediately when we close
          * it. */

diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c
index 64278c6..985b432 100644 (file)
--- a/lustre/portals/knals/socknal/socknal_cb.c
+++ b/lustre/portals/knals/socknal/socknal_cb.c
@@ -2137,7 +2137,11 @@ ksocknal_setup_sock (struct socket *sock)
         int             option;
         struct linger   linger;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+        sock->sk->sk_allocation = GFP_NOFS;
+#else
         sock->sk->allocation = GFP_NOFS;
+#endif
 
         /* Ensure this socket aborts active sends immediately when we close
          * it. */