[folded-merged] ocfs2-o2hb-add-nego_timeout-message-v2.patch removed from -mm tree

[akpm@xxxxxxxxxxxxxxxxxxxx]

The patch titled
     Subject: ocfs2-o2hb-add-nego_timeout-message-v2
has been removed from the -mm tree.  Its filename was
     ocfs2-o2hb-add-nego_timeout-message-v2.patch

This patch was dropped because it was folded into ocfs2-o2hb-add-nego_timeout-message.patch

------------------------------------------------------
From: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Subject: ocfs2-o2hb-add-nego_timeout-message-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 |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -puN fs/ocfs2/cluster/heartbeat.c~ocfs2-o2hb-add-nego_timeout-message-v2 fs/ocfs2/cluster/heartbeat.c
--- a/fs/ocfs2/cluster/heartbeat.c~ocfs2-o2hb-add-nego_timeout-message-v2
+++ a/fs/ocfs2/cluster/heartbeat.c
@@ -420,7 +420,7 @@ static void o2hb_nego_timeout(struct wor
 static int o2hb_nego_timeout_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;
 	struct o2hb_nego_msg *nego_msg;
 
 	nego_msg = (struct o2hb_nego_msg *)msg->buf;
@@ -2102,12 +2102,12 @@ static struct config_item *o2hb_heartbea
 	ret = o2hb_debug_region_init(reg, o2hb_debug_dir);
 	if (ret) {
 		config_item_put(&reg->hr_item);
-		goto free_handler;
+		goto unregister_handler;
 	}
 
 	return &reg->hr_item;
 
-free_handler:
+unregister_handler:
 	o2net_unregister_handler_list(&reg->hr_handler_list);
 free:
 	kfree(reg);
_

Patches currently in -mm which might be from junxiao.bi@xxxxxxxxxx are

ocfs2-o2hb-add-negotiate-timer.patch
ocfs2-o2hb-add-nego_timeout-message.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