summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorAndreas Gruenbacher2011-09-28 22:15:04 +0200
committerPhilipp Reisner2012-05-09 15:15:49 +0200
commit7b4e4d31268cbd885782bf3eee8027c852c9d191 (patch)
treecd6d3dbaa71d9d6b408b4a2f9e7c386f6990ff8b /drivers/block/drbd
parentdrbd: fix "stalled" empty resync (diff)
downloadkernel-qcow2-linux-7b4e4d31268cbd885782bf3eee8027c852c9d191.tar.gz
kernel-qcow2-linux-7b4e4d31268cbd885782bf3eee8027c852c9d191.tar.xz
kernel-qcow2-linux-7b4e4d31268cbd885782bf3eee8027c852c9d191.zip
drbd: drbd_nl_resize(): Fix missing put_ldev() on error path
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_nl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 6d116a2b2321..1a81d9ed1b24 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1727,7 +1727,7 @@ static int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
if (rs.no_resync && mdev->agreed_pro_version < 93) {
retcode = ERR_NEED_APV_93;
- goto fail;
+ goto fail_ldev;
}
if (mdev->ldev->known_size != drbd_get_capacity(mdev->ldev->backing_bdev))
@@ -1754,6 +1754,10 @@ static int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
fail:
reply->ret_code = retcode;
return 0;
+
+ fail_ldev:
+ put_ldev(mdev);
+ goto fail;
}
static int drbd_nl_syncer_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,