search for: o2net_sc_reset_idle_tim

This fix modifies o2net layer behavior which seems to trigger some DLM race issues during umount/evictions that needs to be fixed as well. I am working on the dlm issues but meanwhile please review this patch. Thanks, --Srini

...ons(-) dd88fbb63c1952663eed2f1d93b85a95938cf37c diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index a27d615..2bcf706 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -143,8 +143,8 @@ static void o2net_sc_postpone_idle(struct o2net_sock_container *sc); static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc); #ifdef CONFIG_DEBUG_FS -void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, - u32 msgkey, struct task_struct *task, u8 node) +static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, + u32 msgkey, struct task_struct *tas...

...ed_work(o2net_wq, &nn->nn_connect_expired, + delay + msecs_to_jiffies(o2net_idle_timeout(sc->sc_node))); } /* keep track of the nn's sc ref for the caller */ @@ -1193,6 +1188,7 @@ static int o2net_check_handshake(struct * shut down already */ if (nn->nn_sc == sc) { o2net_sc_reset_idle_timer(sc); + nn->nn_timeout = 0; o2net_set_nn_state(nn, sc, 1, 0); } spin_unlock(&nn->nn_lock); @@ -1391,6 +1387,7 @@ static void o2net_sc_send_keep_req(struc static void o2net_idle_timer(unsigned long data) { struct o2net_sock_container *sc = (struct o2net_sock_container *)data;...

...jiffies(o2net_idle_timeout(sc->sc_node)); + queue_delayed_work(o2net_wq, &nn->nn_connect_expired, delay); } /* keep track of the nn's sc ref for the caller */ @@ -1193,6 +1198,7 @@ static int o2net_check_handshake(struct * shut down already */ if (nn->nn_sc == sc) { o2net_sc_reset_idle_timer(sc); + atomic_set(&nn->nn_timeout, 0); o2net_set_nn_state(nn, sc, 1, 0); } spin_unlock(&nn->nn_lock); @@ -1391,6 +1397,7 @@ static void o2net_sc_send_keep_req(struc static void o2net_idle_timer(unsigned long data) { struct o2net_sock_container *sc = (struct o2net_sock_co...

The only non-fix here is Joel's new configfs convenience macros, but nobody is using them yet, so I think the patch is safe. By the way, these patches (as usual) are all rebased on top of your latest tree. I think that since the vast majority of ocfs2 and configfs patches are self-contained and within a small area of the kernel that this should probably be fine. If you feel otherwise however,

The following series of patches comprises the bulk of our outstanding changes for Ocfs2. Aside from the usual set of cleanups and fixes that were inappropriate for 2.6.25, there are a few highlights: The '/sys/o2cb' directory has been moved to '/sys/fs/o2cb'. The new location meshes better with modern sysfs layout. A symbolic link has been placed in the old location so as to