]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rbd: fix bug in rbd_dev_id_put()
authorAlex Elder <elder@inktank.com>
Thu, 11 Oct 2012 04:19:13 +0000 (21:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jan 2013 16:51:20 +0000 (08:51 -0800)
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>
(cherry picked from commit b213e0b1a62637b2a9395a34349b13d73ca2b90a)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/block/rbd.c

index f1375d98f6e71c1e642686ba2c66e48f440ebca2..d9ebe6844da61325e412648a1cc47cf7f2ff0aa6 100644 (file)
@@ -2150,8 +2150,8 @@ static void rbd_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->id > max_id)
+                       max_id = rbd_dev->id;
        }
        spin_unlock(&rbd_dev_list_lock);