b=1349: always perform the final socket fput() in the reaper context.

        in_interrupt() isn't the right test on 2.5, so we'll just
	toss it instead of reserving the right to get it wrong again.

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index b758985..fc952f9 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -513,11 +513,6 @@ _ksocknal_put_conn (ksock_conn_t *conn)
         LASSERT (conn->ksnc_sock->sk->user_data == NULL);
         LASSERT (!conn->ksnc_rx_scheduled);
 
-        if (!in_interrupt()) {
-                ksocknal_close_conn (conn);
-                return;
-        }
-
         spin_lock_irqsave (&ksocknal_data.ksnd_reaper_lock, flags);
 
         list_add (&conn->ksnc_list, &ksocknal_data.ksnd_reaper_list);

diff --git a/lustre/portals/knals/socknal/socknal.c b/lustre/portals/knals/socknal/socknal.c
index b758985..fc952f9 100644 (file)
--- a/lustre/portals/knals/socknal/socknal.c
+++ b/lustre/portals/knals/socknal/socknal.c
@@ -513,11 +513,6 @@ _ksocknal_put_conn (ksock_conn_t *conn)
         LASSERT (conn->ksnc_sock->sk->user_data == NULL);
         LASSERT (!conn->ksnc_rx_scheduled);
 
-        if (!in_interrupt()) {
-                ksocknal_close_conn (conn);
-                return;
-        }
-
         spin_lock_irqsave (&ksocknal_data.ksnd_reaper_lock, flags);
 
         list_add (&conn->ksnc_list, &ksocknal_data.ksnd_reaper_list);