From 6a372ec6b576b628e13a506edf8ba6a76ec2d497 Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 24 Nov 2009 17:48:38 +0000 Subject: [PATCH] Branch HEAD Fix whitespace (tabs, trailing spaces). --- lustre/ptlrpc/pinger.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c index 0485496..f36e3e1 100644 --- a/lustre/ptlrpc/pinger.c +++ b/lustre/ptlrpc/pinger.c @@ -50,7 +50,7 @@ struct semaphore pinger_sem; static CFS_LIST_HEAD(pinger_imports); -static struct list_head timeout_list = CFS_LIST_HEAD_INIT(timeout_list); +static struct list_head timeout_list = CFS_LIST_HEAD_INIT(timeout_list); struct ptlrpc_request * ptlrpc_prep_ping(struct obd_import *imp) { @@ -146,17 +146,17 @@ cfs_duration_t pinger_check_timeout(cfs_time_t time) struct timeout_item *item; cfs_time_t timeout = PING_INTERVAL; - /* The timeout list is a increase order sorted list */ + /* The timeout list is a increase order sorted list */ mutex_down(&pinger_sem); list_for_each_entry(item, &timeout_list, ti_chain) { - int ti_timeout = item->ti_timeout; - if (timeout > ti_timeout) - timeout = ti_timeout; - break; - } + int ti_timeout = item->ti_timeout; + if (timeout > ti_timeout) + timeout = ti_timeout; + break; + } mutex_up(&pinger_sem); - - return cfs_time_sub(cfs_time_add(time, cfs_time_seconds(timeout)), + + return cfs_time_sub(cfs_time_add(time, cfs_time_seconds(timeout)), cfs_time_current()); } @@ -454,7 +454,7 @@ struct timeout_item* ptlrpc_new_timeout(int time, enum timeout_event event, timeout_cb_t cb, void *data) { struct timeout_item *ti; - + OBD_ALLOC_PTR(ti); if (!ti) return(NULL); @@ -465,7 +465,7 @@ struct timeout_item* ptlrpc_new_timeout(int time, enum timeout_event event, ti->ti_event = event; ti->ti_cb = cb; ti->ti_cb_data = data; - + return ti; } @@ -499,7 +499,7 @@ out: return item; } -/* Add a client_obd to the timeout event list, when timeout(@time) +/* Add a client_obd to the timeout event list, when timeout(@time) * happens, the callback(@cb) will be called. */ int ptlrpc_add_timeout_client(int time, enum timeout_event event, @@ -517,15 +517,15 @@ int ptlrpc_add_timeout_client(int time, enum timeout_event event, list_add(obd_list, &ti->ti_obd_list); mutex_up(&pinger_sem); return 0; -} +} -int ptlrpc_del_timeout_client(struct list_head *obd_list, +int ptlrpc_del_timeout_client(struct list_head *obd_list, enum timeout_event event) { struct timeout_item *ti = NULL, *item; if (list_empty(obd_list)) - return 0; + return 0; mutex_down(&pinger_sem); list_del_init(obd_list); /** @@ -545,7 +545,7 @@ int ptlrpc_del_timeout_client(struct list_head *obd_list, } mutex_up(&pinger_sem); return 0; -} +} int ptlrpc_pinger_remove_timeouts(void) { @@ -911,13 +911,13 @@ int ptlrpc_add_timeout_client(int time, enum timeout_event event, struct list_head *obd_list) { return 0; -} +} int ptlrpc_del_timeout_client(struct list_head *obd_list, enum timeout_event event) { return 0; -} +} int ptlrpc_pinger_add_import(struct obd_import *imp) { -- 1.8.3.1