From 3e61da2828847062dae2ba6ed0397063d80df954 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Thu, 30 Aug 2012 00:16:38 -0500 Subject: [PATCH] --- yaml --- r: 331664 b: refs/heads/master c: cd789ab9cacbda1aad43304b89cff29004b793ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 4781028f8954..152dce01e169 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bb1f1ed0063870f34ae5783cda08924964bac0b +refs/heads/master: cd789ab9cacbda1aad43304b89cff29004b793ea diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 214c937a6de5..144694ee03a5 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -2244,29 +2244,21 @@ static int rbd_dev_snap_devs_update(struct rbd_device *rbd_dev) static int rbd_bus_add_dev(struct rbd_device *rbd_dev) { - int ret; struct device *dev; - struct rbd_snap *snap; + int ret; mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING); - dev = &rbd_dev->dev; + dev = &rbd_dev->dev; dev->bus = &rbd_bus_type; dev->type = &rbd_device_type; dev->parent = &rbd_root_dev; dev->release = rbd_dev_release; dev_set_name(dev, "%d", rbd_dev->dev_id); ret = device_register(dev); - if (ret < 0) - goto out; - list_for_each_entry(snap, &rbd_dev->snaps, node) { - ret = rbd_register_snap_dev(snap, &rbd_dev->dev); - if (ret < 0) - break; - } -out: mutex_unlock(&ctl_mutex); + return ret; }