The patch titled Subject: ocfs2-o2hb-add-some-user-debug-log-v2 has been added to the -mm tree. Its filename is ocfs2-o2hb-add-some-user-debug-log-v2.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-o2hb-add-some-user-debug-log-v2.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-o2hb-add-some-user-debug-log-v2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Subject: ocfs2-o2hb-add-some-user-debug-log-v2 Signed-off-by: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Reviewed-by: Ryan Ding <ryan.ding@xxxxxxxxxx> Cc: Gang He <ghe@xxxxxxxx> Cc: rwxybh <rwxybh@xxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Joseph Qi <joseph.qi@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/cluster/heartbeat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ocfs2/cluster/heartbeat.c~ocfs2-o2hb-add-some-user-debug-log-v2 fs/ocfs2/cluster/heartbeat.c --- a/fs/ocfs2/cluster/heartbeat.c~ocfs2-o2hb-add-some-user-debug-log-v2 +++ a/fs/ocfs2/cluster/heartbeat.c @@ -468,7 +468,7 @@ static int o2hb_nego_timeout_handler(str static int o2hb_nego_approve_handler(struct o2net_msg *msg, u32 len, void *data, void **ret_data) { - struct o2hb_region *reg = (struct o2hb_region *)data; + struct o2hb_region *reg = data; printk(KERN_NOTICE "o2hb: negotiate timeout approved by master node on region %s (%s).\n", config_item_name(®->hr_item), reg->hr_dev_name); _ Patches currently in -mm which might be from junxiao.bi@xxxxxxxxxx are ocfs2-o2hb-fix-double-free-bug.patch ocfs2-o2hb-add-negotiate-timer.patch ocfs2-o2hb-add-negotiate-timer-v2.patch ocfs2-o2hb-add-nego_timeout-message.patch ocfs2-o2hb-add-nego_timeout-message-v2.patch ocfs2-o2hb-add-negotiate_approve-message.patch ocfs2-o2hb-add-negotiate_approve-message-v2.patch ocfs2-o2hb-add-some-user-debug-log.patch ocfs2-o2hb-add-some-user-debug-log-v2.patch ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch ocfs2-o2hb-fix-hb-hung-time.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html