From patchwork Thu Jul 19 21:08:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1218521 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 D8B1B3FD48 for ; Thu, 19 Jul 2012 21:08:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524Ab2GSVIV (ORCPT ); Thu, 19 Jul 2012 17:08:21 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:52082 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751525Ab2GSVIT (ORCPT ); Thu, 19 Jul 2012 17:08:19 -0400 Received: by gglu4 with SMTP id u4so3299611ggl.19 for ; Thu, 19 Jul 2012 14:08:19 -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=8qifcLfeAOWgJWB3VWc43aEWtZMHMuqs43IBUXaVEWs=; b=FNf/WNEUamzJ5KoCuz1O8mN3bHuRsKY56MfJQ9aOt9B9rFGNyBO1vf6KyJcvvDiYRk y2FvqIGSjR60CHXgZEQRaOrYGZLkBYiGcFIBAfrrkU0Jd/fVRfISx4tR3AJXpubNaWcZ SSK8fC//+3ReS2H/yapDpxca/Eqe2KwVxwH+02g6nBZyS/L4NVg/7Jy7wWro5NiEmAi9 S6XOhfFlkO1rN1oRfoWAzqI4vazArCZdAmDzgk+GiavmI1KxfrlM0oeuztGBvm7LizPZ BioAr0uCpoCBP+yBFssbg0fjwxfNUqrGxhCoEpSjr97R181/5xiBEQ6RvGVuQbqXXqLr tERw== Received: by 10.50.159.196 with SMTP id xe4mr6597081igb.43.1342732098964; Thu, 19 Jul 2012 14:08:18 -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 wp10sm5470201igb.6.2012.07.19.14.08.18 (version=SSLv3 cipher=OTHER); Thu, 19 Jul 2012 14:08:18 -0700 (PDT) Message-ID: <50087741.2030005@inktank.com> Date: Thu, 19 Jul 2012 16:08:17 -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 01/12] rbd: drop extra header_rwsem init References: <500874F5.4090205@inktank.com> In-Reply-To: <500874F5.4090205@inktank.com> X-Gm-Message-State: ALoCoQmfQhDsakWovpfU1iaHS8gHpAagcCInooWjEtJgm4Yh7lF2Ice7gvE4QAvhdYL+wmg1b83V 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. (Guangliang Zhao also offered up the same fix.) Reported-by: Guangliang Zhao Signed-off-by: Alex Elder --- drivers/block/rbd.c | 2 -- 1 files changed, 0 insertions(+), 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);