diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2008-02-28 16:51:01 -0800 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2008-02-28 16:51:01 -0800 |
| commit | 2c3b0c61cdba0c272b4dafbd123e022ea3d073ef (patch) | |
| tree | df802b8c9fcf702f9ce92e967b089ccb9c21e2a5 /fs | |
| parent | 4ad4aca4665b50eb5c6067314bfcc8be5b1ec80c (diff) | |
| parent | 570f27b1ce2474f1351928e58cd6ec52c17c8bf9 (diff) | |
Merge branch 'o2net_reconnect' into linux-next
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/cluster/tcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index d808bfae6138..0e7d2749513d 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -444,9 +444,9 @@ static void o2net_set_nn_state(struct o2net_node *nn, /* delay if we're withing a RECONNECT_DELAY of the * last attempt */ delay = (nn->nn_last_connect_attempt + - msecs_to_jiffies(o2net_reconnect_delay(sc->sc_node))) + msecs_to_jiffies(o2net_reconnect_delay(NULL))) - jiffies; - if (delay > msecs_to_jiffies(o2net_reconnect_delay(sc->sc_node))) + if (delay > msecs_to_jiffies(o2net_reconnect_delay(NULL))) delay = 0; mlog(ML_CONN, "queueing conn attempt in %lu jiffies\n", delay); queue_delayed_work(o2net_wq, &nn->nn_connect_work, delay); @@ -460,7 +460,7 @@ static void o2net_set_nn_state(struct o2net_node *nn, * the connect_expired work will do anything. The rest will see * that it's already queued and do nothing. */ - delay += msecs_to_jiffies(o2net_idle_timeout(sc->sc_node)); + delay += msecs_to_jiffies(o2net_idle_timeout(NULL)); queue_delayed_work(o2net_wq, &nn->nn_connect_expired, delay); } |