drbd: Fixes from the drbd-8.3 branch
authorPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 10 Nov 2011 11:12:52 +0000 (12:12 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:05 +0000 (16:58 +0100)
commit0cfac5dd904ec8b376beb27f6ad265b12d71bf9e
tree91f100e963ae038e7bc410eb0b4ba7beb61eae72
parent376694a0543f5da194d9c6e102cfcd023ffac949
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>
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_nl.c
drivers/block/drbd/drbd_state.c
drivers/block/drbd/drbd_worker.c