From dbcf24b5940b76891210f372f4146216f171280b Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Fri, 16 Nov 2012 12:27:41 +0100 Subject: [PATCH] --- yaml --- r: 346293 b: refs/heads/master c: 298307ed1d2ac4815b0ce9a5f1c9cc643f4a9aca h: refs/heads/master i: 346291: 2a07ef7d11dc8479b5c103fe97545aa7503c792f v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 51cc46392a49..e64dcbe19469 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84ad6845fbb1248228d3beab8084e4b5f6f82b1d +refs/heads/master: 298307ed1d2ac4815b0ce9a5f1c9cc643f4a9aca diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 52de26daa1f6..8c13eeb83c53 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -840,7 +840,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags) } spin_lock_irq(&mdev->ldev->md.uuid_lock); for (i = UI_CURRENT; i < UI_SIZE; i++) - p->uuid[i] = mdev->ldev ? cpu_to_be64(mdev->ldev->md.uuid[i]) : 0; + p->uuid[i] = cpu_to_be64(mdev->ldev->md.uuid[i]); spin_unlock_irq(&mdev->ldev->md.uuid_lock); mdev->comm_bm_set = drbd_bm_total_weight(mdev);