From d15aff18d8d0cc2de217a2b2cea0e1a38dcb9ec8 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Fri, 15 Jul 2011 17:19:18 +0200 Subject: [PATCH] --- yaml --- r: 346111 b: refs/heads/master c: d505d9bef2c86e80e6fba070a2fe459debb8b719 h: refs/heads/master i: 346109: 5671c8bdc2442cf23355dc62764790db0b2f9b68 346107: 5a0dd6beed9c0476bbf10bfaaa7ebc02a4d0dabc 346103: 9593ad5ef294e84dc56f87c23cfd83d868a7ddb4 346095: 47af22a5937c762ac63a7cd0dd28dc41037e5dda 346079: 6d7ad1bcdbc84ad7c68d8e5aa12b061c4f30aa31 346047: 3eb87e133d3f53a7bb63aba8421ab4a3438377ae 345983: 0fa6f10a9a0cc8ca981b7491a4b87cc5fe6dde90 345855: 7dcdeb1fef61092eeba92df0338d84f3aabaef16 345599: aaac4fa127fbdcc862eac359156af6c7be553b4b 345087: b8c0a9506e5aeb843fb076c5da60f80ba12cf217 344063: 542864cb4e45606463ac92ca9294dbd9177bd875 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8a5afa920e6e..9d031a68210b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbc12f4514279264b5ecd5ae24f94be08e108dcd +refs/heads/master: d505d9bef2c86e80e6fba070a2fe459debb8b719 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 06bbf0f79fc5..aa674bf8a10b 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -3093,37 +3093,37 @@ static int receive_protocol(struct drbd_tconn *tconn, struct packet_info *pi) nc = rcu_dereference(tconn->net_conf); if (p_proto != nc->wire_protocol) { - conn_err(tconn, "incompatible communication protocols\n"); + conn_err(tconn, "incompatible %s settings\n", "protocol"); goto disconnect_rcu_unlock; } if (convert_after_sb(p_after_sb_0p) != nc->after_sb_0p) { - conn_err(tconn, "incompatible after-sb-0pri settings\n"); + conn_err(tconn, "incompatible %s settings\n", "after-sb-0pri"); goto disconnect_rcu_unlock; } if (convert_after_sb(p_after_sb_1p) != nc->after_sb_1p) { - conn_err(tconn, "incompatible after-sb-1pri settings\n"); + conn_err(tconn, "incompatible %s settings\n", "after-sb-1pri"); goto disconnect_rcu_unlock; } if (convert_after_sb(p_after_sb_2p) != nc->after_sb_2p) { - conn_err(tconn, "incompatible after-sb-2pri settings\n"); + conn_err(tconn, "incompatible %s settings\n", "after-sb-2pri"); goto disconnect_rcu_unlock; } if (p_discard_my_data && nc->discard_my_data) { - conn_err(tconn, "both sides have the 'discard_my_data' flag set\n"); + conn_err(tconn, "incompatible %s settings\n", "discard-my-data"); goto disconnect_rcu_unlock; } if (p_two_primaries != nc->two_primaries) { - conn_err(tconn, "incompatible setting of the two-primaries options\n"); + conn_err(tconn, "incompatible %s settings\n", "allow-two-primaries"); goto disconnect_rcu_unlock; } if (strcmp(integrity_alg, nc->integrity_alg)) { - conn_err(tconn, "incompatible setting of the data-integrity-alg\n"); + conn_err(tconn, "incompatible %s settings\n", "data-integrity-alg"); goto disconnect_rcu_unlock; }