From b88baabb927cf735329aa5073ea1a7f845d5e6c4 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 20 May 2010 14:45:07 +0200 Subject: [PATCH] --- yaml --- r: 196883 b: refs/heads/master c: 4e23a59ed1c5f12e14f7899855f8379b3d42e578 h: refs/heads/master i: 196881: d5f8c4d4949afa2489adb0e3719bad6afb83f3db 196879: c9e01130faad61741f4ce6bc9fc36115e68929be v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9ae560e239e7..d536c7b08cba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23ce422748def9652fdc019f740cd7900fa2fe3b +refs/heads/master: 4e23a59ed1c5f12e14f7899855f8379b3d42e578 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index a949fc45f7ef..be2d2da9cdba 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1213,8 +1213,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, && (ns.pdsk < D_INCONSISTENT || ns.pdsk == D_UNKNOWN || ns.pdsk == D_OUTDATED)) { - kfree(mdev->p_uuid); - mdev->p_uuid = NULL; if (get_ldev(mdev)) { if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) && mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE &&