Commit 196fe71d authored Dec 10, 2014 by Junxiao Bi Committed by Linus Torvalds Dec 10, 2014

ocfs2: o2net: fix connect expired



Set nn_persistent_error to -ENOTCONN will stop reconnect since the
"stop" condition in o2net_start_connect() will be true.

    stop = (nn->nn_sc ||
                (nn->nn_persistent_error &&
                (nn->nn_persistent_error != -ENOTCONN || timeout == 0)));

This will make connection never be established if the first connection
request is lost.

Set nn_persistent_error to 0 when connect expired to fix this.  With
this changes, dlm will not be waken up when connect expired, this is OK
since dlm depends on network, dlm can do nothing in this case if waken
up.  Let it wait there for network recover and connect built again to
continue.

Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Srinivas Eeda <srinivas.eeda@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cb79662b

fs/ocfs2/cluster/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1736,7 +1736,7 @@ static void o2net_connect_expired(struct work_struct *work)
		o2net_idle_timeout() / 1000,
		o2net_idle_timeout() % 1000);

		o2net_set_nn_state(nn, NULL, 0, -ENOTCONN);
		o2net_set_nn_state(nn, NULL, 0, 0);
		}
		spin_unlock(&nn->nn_lock);
		}

Admin message