From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Elder Subject: [PATCH 01/12] rbd: drop extra header_rwsem init Date: Thu, 19 Jul 2012 16:08:17 -0500 Message-ID: <50087741.2030005@inktank.com> References: <500874F5.4090205@inktank.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: 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) In-Reply-To: <500874F5.4090205@inktank.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: 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); -- 1.7.5.4