From patchwork Thu Oct 11 15:34:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1582401 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4532DDFABE for ; Thu, 11 Oct 2012 15:34:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753751Ab2JKPe1 (ORCPT ); Thu, 11 Oct 2012 11:34:27 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:61071 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754964Ab2JKPe0 (ORCPT ); Thu, 11 Oct 2012 11:34:26 -0400 Received: by mail-da0-f46.google.com with SMTP id n41so817474dak.19 for ; Thu, 11 Oct 2012 08:34:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=rV8puSfsShzrv4jJb+DB5QGwY6NqhEY2spwjg4T7syM=; b=dpb2438ZHDK4Rljx7tbTiMWvEhMfBYx2e7ueXJpo4OMdMDKDnUF47YufPqmRKsJSKT DfpCA92qxdNfI5ZgagllHkDfVKW0TvlGBgbDh/KhO9ckWahXAsmv/we1IL8DzCVScFLS j2u+xVPawpM9HZBy9PVQV/+2AbW0HwqzAIhBcJCrh11qERDKR8zrPx+7sqGEtgNjDvHb 0vbCcgxCD6AyCtwIN50PiB1bLkXi9/FCyd+doswTIyqpvCc0wP5qcs05rEZEDxlUaiRZ L5BxqjnnCY1NJLe4Pt7DH95fkFjoflk1q4a4JophdDjVs4vOwqWKk74/ryksl2XGDTil cg6A== Received: by 10.68.224.69 with SMTP id ra5mr4562034pbc.114.1349969665798; Thu, 11 Oct 2012 08:34:25 -0700 (PDT) Received: from ?IPv6:2607:f298:a:607:1059:f4c1:babe:9559? ([2607:f298:a:607:1059:f4c1:babe:9559]) by mx.google.com with ESMTPS id qd9sm2900736pbb.31.2012.10.11.08.34.24 (version=SSLv3 cipher=OTHER); Thu, 11 Oct 2012 08:34:24 -0700 (PDT) Message-ID: <5076E6FE.9070400@inktank.com> Date: Thu, 11 Oct 2012 08:34:22 -0700 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120912 Thunderbird/15.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: fix bug in rbd_dev_id_put() X-Gm-Message-State: ALoCoQnfPaZhuVT8apFYBP/0EYs/npNodldD6lvdW49sD3WD7LHN3N6/73rq/Ob+ku/HdroPfJ1y Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 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 Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index ca28036..cf5d109 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2642,8 +2642,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);