From patchwork Thu Jul 26 18:44:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1244061 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 4CBD93FC5A for ; Thu, 26 Jul 2012 18:44:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752181Ab2GZSom (ORCPT ); Thu, 26 Jul 2012 14:44:42 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:59777 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751941Ab2GZSol (ORCPT ); Thu, 26 Jul 2012 14:44:41 -0400 Received: by gglu4 with SMTP id u4so2311502ggl.19 for ; Thu, 26 Jul 2012 11:44:41 -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:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=r1jUdCuV/ddjam0vBwh8lasSGer7tMTI4GCzs9Tx808=; b=gjFrsq2YaLzfqMkotxHJtHpxPvI8p5fb3Df1KL6zkE9OSBKIfOgzYuz5TzxvJuBCyb 8yf/2MVcsZZq0DYjakP1eIZsYCzFGLNvaBngykUPieTr8yhScGX8VO1RF8o/TljqjhWl U+v3X/C2Y86gYz5DkCFlw0B98WPgLqIOmROu3F1lOaBF4+TyCHuD0v22PAP0pMKnmYRJ f3RS3eODwN2p9WnElMe56SFGjlqHRg5omx5qhE6r7MSWawveyfTZ9SmFTXGGP5SrsCIP dY89IFd2LHrlN0YC3FMIPdIOidhCTrDo+Dvt2rf77z5bBHp4a3+NPolOWJh2r00Qi6sw RaJQ== Received: by 10.236.186.73 with SMTP id v49mr28332801yhm.48.1343328281007; Thu, 26 Jul 2012 11:44:41 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id p2sm12636098ani.18.2012.07.26.11.44.39 (version=SSLv3 cipher=OTHER); Thu, 26 Jul 2012 11:44:40 -0700 (PDT) Message-ID: <50119017.2010903@inktank.com> Date: Thu, 26 Jul 2012 13:44:39 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/6] rbd: drop extra header_rwsem init References: <50118F33.7080502@inktank.com> In-Reply-To: <50118F33.7080502@inktank.com> X-Gm-Message-State: ALoCoQnA6qbxBnsUVCiBvI4jPWBx9sd4HQ91nrIKhreKHlcms3Q70rt4h60pWCJnDewBSCvsDZt2 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org In commit c666601a there was inadvertently added an extra initialization of rbd_dev->header_rwsem. This gets rid of the duplicate. Reported-by: Guangliang Zhao Signed-off-by: Alex Elder --- drivers/block/rbd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 6df8c62..b9895fe 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2458,8 +2458,6 @@ static ssize_t rbd_add(struct bus_type *bus, INIT_LIST_HEAD(&rbd_dev->snaps); init_rwsem(&rbd_dev->header_rwsem); - init_rwsem(&rbd_dev->header_rwsem); - /* generate unique id: find highest unique id, add one */ rbd_id_get(rbd_dev);