summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-10-11 06:19:13 +0200
committerAlex Elder <elder@inktank.com>2012-10-27 00:18:08 +0200
commitb213e0b1a62637b2a9395a34349b13d73ca2b90a (patch)
treee096a1d0b33102ed8e433da468b45e0a9eede1c4 /drivers/block
parentceph: Fix NULL ptr crash in strlen() (diff)
downloadlinux-b213e0b1a62637b2a9395a34349b13d73ca2b90a.tar.xz
linux-b213e0b1a62637b2a9395a34349b13d73ca2b90a.zip
rbd: fix bug in rbd_dev_id_put()
In rbd_dev_id_put(), there's a loop that's intended to determine the maximum device id in use. But it isn't doing that at all, the effect of how it's written is to simply use the just-put id number, which ignores whole purpose of this function. Fix the bug. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8f56d37637a7..4a16464ad5bb 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2680,8 +2680,8 @@ static void rbd_dev_id_put(struct rbd_device *rbd_dev)
struct rbd_device *rbd_dev;
rbd_dev = list_entry(tmp, struct rbd_device, node);
- if (rbd_id > max_id)
- max_id = rbd_id;
+ if (rbd_dev->dev_id > max_id)
+ max_id = rbd_dev->dev_id;
}
spin_unlock(&rbd_dev_list_lock);