diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-11-10 06:12:52 -0500 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:58:05 -0500 |
| commit | 0cfac5dd904ec8b376beb27f6ad265b12d71bf9e (patch) | |
| tree | 91f100e963ae038e7bc410eb0b4ba7beb61eae72 /drivers/block/drbd/drbd_state.c | |
| parent | 376694a0543f5da194d9c6e102cfcd023ffac949 (diff) | |
drbd: Fixes from the drbd-8.3 branch
* drbd-8.3:
drbd: fix spurious meta data IO "error"
drbd: Fixed a race condition between detach and start of resync
drbd: fix harmless race to not trigger an ASSERT
drbd: Derive sync-UUIDs only from the bitmap-uuid if it is non-zero
drbd: Fixed current UUID generation (regression introduced recently, after 8.3.11)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 4075bd2d2515..dffc6973e2b5 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c | |||
| @@ -1231,6 +1231,11 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, | |||
| 1231 | } | 1231 | } |
| 1232 | 1232 | ||
| 1233 | if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) { | 1233 | if (ns.pdsk < D_INCONSISTENT && get_ldev(mdev)) { |
| 1234 | if (os.peer == R_SECONDARY && ns.peer == R_PRIMARY && | ||
| 1235 | mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) { | ||
| 1236 | drbd_uuid_new_current(mdev); | ||
| 1237 | drbd_send_uuids(mdev); | ||
| 1238 | } | ||
| 1234 | /* D_DISKLESS Peer becomes secondary */ | 1239 | /* D_DISKLESS Peer becomes secondary */ |
| 1235 | if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY) | 1240 | if (os.peer == R_PRIMARY && ns.peer == R_SECONDARY) |
| 1236 | /* We may still be Primary ourselves. | 1241 | /* We may still be Primary ourselves. |