bd99eea891
* add patch
+ boo1230635_01-compat-fix-nla_nest_start_noflag-test.patch
+ boo1230635_02-drbd-port-block-device-access-to-file.patch
* update patch
+ bsc1226510-fix-build-err-against-6.9.3.patch
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=152
14 lines
696 B
Diff
14 lines
696 B
Diff
diff -Naur drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c
|
|
--- drbd-9.0.7rc1+git.093821cd.orig/drbd/drbd_receiver.c 2017-03-24 16:55:42.169376092 +0800
|
|
+++ drbd-9.0.7rc1+git.093821cd/drbd/drbd_receiver.c 2017-03-24 16:56:51.137239174 +0800
|
|
@@ -6240,7 +6240,8 @@
|
|
/* if peer_state changes to connected at the same time,
|
|
* it explicitly notifies us that it finished resync.
|
|
* Maybe we should finish it up, too? */
|
|
- else if (peer_state.conn == L_ESTABLISHED) {
|
|
+ else if (peer_state.conn == L_ESTABLISHED &&
|
|
+ peer_disk_state > D_NEGOTIATING) {
|
|
bool finish_now = false;
|
|
|
|
if (old_peer_state.conn == L_WF_BITMAP_S) {
|