From 4367845879d27654a5930398c090ed09ebea1cd3 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Wed, 16 Mar 2011 16:52:10 +0100 Subject: [PATCH] --- yaml --- r: 345879 b: refs/heads/master c: 40cbf085f584840847e3f945c10c75f7d36237fc h: refs/heads/master i: 345877: 3a01b4e492431941f1a85d010dba647a631c4450 345875: bb1f6999a271a84abe5c9c7aba7b603b35de23b7 345871: 5988e876aba0a6b696fab7cc6e1e006abc9b0438 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d78dd2663dd0..c2403ec758c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4f78edee10ebe789564c8468d8a6b995e4045bb +refs/heads/master: 40cbf085f584840847e3f945c10c75f7d36237fc diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index d952e877f8d5..daf388f4bd17 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -1041,7 +1041,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) if (!adm_ctx.reply_skb) return retcode; if (retcode != NO_ERROR) - goto fail; + goto finish; mdev = adm_ctx.mdev; conn_reconfig_start(mdev->tconn); @@ -1400,8 +1400,8 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) force_diskless: drbd_force_state(mdev, NS(disk, D_FAILED)); drbd_md_sync(mdev); - conn_reconfig_done(mdev->tconn); fail: + conn_reconfig_done(mdev->tconn); if (nbc) { if (nbc->backing_bdev) blkdev_put(nbc->backing_bdev, @@ -1413,6 +1413,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) } lc_destroy(resync_lru); + finish: drbd_adm_finish(info, retcode); return 0; }