linux-2-6-22-updates-20070611

[openafs.git] / src / rx / LINUX / rx_knet.c

diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
index 7cddc22..9d3b4ad 100644 (file)
--- a/src/rx/LINUX/rx_knet.c
+++ b/src/rx/LINUX/rx_knet.c
@@ -164,6 +164,32 @@ osi_NetReceive(osi_socket so, struct sockaddr_in *from, struct iovec *iov,
     TO_KERNEL_SPACE();
 
     if (code < 0) {
+#ifdef AFS_LINUX26_ENV
+#ifdef CONFIG_PM
+       if (
+#ifdef PF_FREEZE
+           current->flags & PF_FREEZE
+#else
+#if defined(STRUCT_TASK_STRUCT_HAS_TODO)
+           !current->todo
+#else
+#if defined(STRUCT_TASK_STRUCT_HAS_THREAD_INFO)
+            test_ti_thread_flag(current->thread_info, TIF_FREEZE)
+#else
+            test_ti_thread_flag(task_thread_info(current), TIF_FREEZE)
+#endif
+#endif
+#endif
+           )
+#ifdef LINUX_REFRIGERATOR_TAKES_PF_FREEZE
+           refrigerator(PF_FREEZE);
+#else
+           refrigerator();
+#endif
+           set_current_state(TASK_INTERRUPTIBLE);
+#endif
+#endif
+
        /* Clear the error before using the socket again.
         * Oh joy, Linux has hidden header files as well. It appears we can
         * simply call again and have it clear itself via sock_error().
@@ -182,21 +208,43 @@ osi_NetReceive(osi_socket so, struct sockaddr_in *from, struct iovec *iov,
 
     return code;
 }
+#ifdef EXPORTED_TASKLIST_LOCK
 extern rwlock_t tasklist_lock __attribute__((weak));
+#endif
 void
 osi_StopListener(void)
 {
     struct task_struct *listener;
     extern int rxk_ListenerPid;
 
-    if (&tasklist_lock)
-      read_lock(&tasklist_lock);
-    listener = find_task_by_pid(rxk_ListenerPid);
-    if (&tasklist_lock)
-       read_unlock(&tasklist_lock);
     while (rxk_ListenerPid) {
-       flush_signals(listener);
-       force_sig(SIGKILL, listener);
+#ifdef EXPORTED_TASKLIST_LOCK
+       if (&tasklist_lock)
+          read_lock(&tasklist_lock);
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#ifdef EXPORTED_TASKLIST_LOCK
+       else
+#endif
+          rcu_read_lock();
+#endif
+       listener = find_task_by_pid(rxk_ListenerPid);
+        if (listener) {
+           flush_signals(listener);
+           force_sig(SIGKILL, listener);
+       }
+#ifdef EXPORTED_TASKLIST_LOCK
+       if (&tasklist_lock)
+           read_unlock(&tasklist_lock);
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#ifdef EXPORTED_TASKLIST_LOCK
+       else
+#endif
+          rcu_read_unlock();
+#endif
+       if (!listener)
+           break;
        afs_osi_Sleep(&rxk_ListenerPid);
     }
     sock_release(rx_socket);