drbd: Do not Oops when C_STANDALONE when uuid gets generated
authorPhilipp Reisner <philipp.reisner@linbit.com>
Wed, 19 May 2010 14:28:28 +0000 (16:28 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 21 May 2010 19:12:00 +0000 (21:12 +0200)
Got introduces with

commit 0c3f34516e8c5a1a0ba3585a7777d32bbbdf4ecb
Author: Philipp Reisner <philipp.reisner@linbit.com>
Date:   Mon May 17 16:10:43 2010 +0200

    drbd: Create new current UUID as late as possible

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
drivers/block/drbd/drbd_main.c

index c144509..7e057b0 100644 (file)
@@ -1354,7 +1354,10 @@ static int w_new_current_uuid(struct drbd_conf *mdev, struct drbd_work *w, int c
 {
        if (get_ldev(mdev)) {
                drbd_uuid_new_current(mdev);
-               drbd_send_uuids(mdev);
+               if (get_net_conf(mdev)) {
+                       drbd_send_uuids(mdev);
+                       put_net_conf(mdev);
+               }
                drbd_md_sync(mdev);
                put_ldev(mdev);
        }