Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[~andy/linux] / drivers / staging / lustre / lustre / ptlrpc / pinger.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/pinger.c b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
index 4d340f4a2198618d22bc37ab9cebb4f0c0cb2c06..6dff502ce23e6fdc3764cda314a3cf346b582735 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/pinger.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
@@ -45,7 +45,8 @@
 #include "ptlrpc_internal.h"
 
 static int suppress_pings;
-CFS_MODULE_PARM(suppress_pings, "i", int, 0644, "Suppress pings");
+module_param(suppress_pings, int, 0644);
+MODULE_PARM_DESC(suppress_pings, "Suppress pings");
 
 struct mutex pinger_mutex;
 static LIST_HEAD(pinger_imports);
@@ -140,9 +141,6 @@ static inline int ptlrpc_next_reconnect(struct obd_import *imp)
                return cfs_time_shift(obd_timeout);
 }
 
-static atomic_t suspend_timeouts = ATOMIC_INIT(0);
-static cfs_time_t suspend_wakeup_time = 0;
-
 cfs_duration_t pinger_check_timeout(cfs_time_t time)
 {
        struct timeout_item *item;
@@ -162,67 +160,6 @@ cfs_duration_t pinger_check_timeout(cfs_time_t time)
                                         cfs_time_current());
 }
 
-static wait_queue_head_t suspend_timeouts_waitq;
-
-cfs_time_t ptlrpc_suspend_wakeup_time(void)
-{
-       return suspend_wakeup_time;
-}
-
-void ptlrpc_deactivate_timeouts(struct obd_import *imp)
-{
-       /*XXX: disabled for now, will be replaced by adaptive timeouts */
-#if 0
-       if (imp->imp_no_timeout)
-               return;
-       imp->imp_no_timeout = 1;
-       atomic_inc(&suspend_timeouts);
-       CDEBUG(D_HA|D_WARNING, "deactivate timeouts %u\n",
-              atomic_read(&suspend_timeouts));
-#endif
-}
-
-void ptlrpc_activate_timeouts(struct obd_import *imp)
-{
-       /*XXX: disabled for now, will be replaced by adaptive timeouts */
-#if 0
-       if (!imp->imp_no_timeout)
-               return;
-       imp->imp_no_timeout = 0;
-       LASSERT(atomic_read(&suspend_timeouts) > 0);
-       if (atomic_dec_and_test(&suspend_timeouts)) {
-               suspend_wakeup_time = cfs_time_current();
-               wake_up(&suspend_timeouts_waitq);
-       }
-       CDEBUG(D_HA|D_WARNING, "activate timeouts %u\n",
-              atomic_read(&suspend_timeouts));
-#endif
-}
-
-int ptlrpc_check_suspend(void)
-{
-       if (atomic_read(&suspend_timeouts))
-               return 1;
-       return 0;
-}
-
-int ptlrpc_check_and_wait_suspend(struct ptlrpc_request *req)
-{
-       struct l_wait_info lwi;
-
-       if (atomic_read(&suspend_timeouts)) {
-               DEBUG_REQ(D_NET, req, "-- suspend %d regular timeout",
-                         atomic_read(&suspend_timeouts));
-               lwi = LWI_INTR(NULL, NULL);
-               l_wait_event(suspend_timeouts_waitq,
-                            atomic_read(&suspend_timeouts) == 0, &lwi);
-               DEBUG_REQ(D_NET, req, "-- recharge regular timeout");
-               return 1;
-       }
-       return 0;
-}
-
-
 static bool ir_up;
 
 void ptlrpc_pinger_ir_up(void)
@@ -377,7 +314,6 @@ int ptlrpc_start_pinger(void)
                return -EALREADY;
 
        init_waitqueue_head(&pinger_thread.t_ctl_waitq);
-       init_waitqueue_head(&suspend_timeouts_waitq);
 
        strcpy(pinger_thread.t_name, "ll_ping");
 
@@ -576,7 +512,7 @@ int ptlrpc_del_timeout_client(struct list_head *obd_list,
                        break;
                }
        }
-       LASSERTF(ti != NULL, "ti is NULL ! \n");
+       LASSERTF(ti != NULL, "ti is NULL !\n");
        if (list_empty(&ti->ti_obd_list)) {
                list_del(&ti->ti_chain);
                OBD_FREE_PTR(ti);