From patchwork Fri Oct 23 18:41:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 7474021 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D740C9F4DD for ; Fri, 23 Oct 2015 17:01:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0ACD920803 for ; Fri, 23 Oct 2015 17:01:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 268DB20684 for ; Fri, 23 Oct 2015 17:01:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752055AbbJWRBe (ORCPT ); Fri, 23 Oct 2015 13:01:34 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:33331 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751285AbbJWRBd (ORCPT ); Fri, 23 Oct 2015 13:01:33 -0400 Received: by wijp11 with SMTP id p11so86238759wij.0 for ; Fri, 23 Oct 2015 10:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=0j6dfpVV5O5sdwXfgcg/Rcifee3aa4Nq2XQEuWLKNWI=; b=WoKsanlXRpwYuWbX2hhdSGKdSDjEsWuBS+JgpSemGXxzH/ucHMu8pxmIbK+tfbrFI+ EG9IUhDOp8Wkteh0k1hoD51wvCJR8VIYbIybZEEddO91f3SdRVI38Tc8tZ7wC4jf0wHm wyKV0PdC5OUDOM28wSmcd0AbYMpFwz5PDkfhS1GQpo2gIldkOtl69rO/HLVf6Y9HOhsw ooCVMJ2LEUcQQ712XSxQ8GXa5HTg+ja2FJBUZKRVoYSNxPJiakHZiQ12zSnfvBI7u31e UfVTkChIfSKJNX2jtMXYjPd2pD0MPGZ6EsFhx2HY8Xd1XBLWYLjZSg8Zl3oIun8JPwpc LR3A== X-Received: by 10.180.37.201 with SMTP id a9mr6189631wik.70.1445619692272; Fri, 23 Oct 2015 10:01:32 -0700 (PDT) Received: from orange.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id nf15sm3582397wic.22.2015.10.23.10.01.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2015 10:01:31 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH] rbd: remove duplicate calls to rbd_dev_mapping_clear() Date: Fri, 23 Oct 2015 20:41:04 +0200 Message-Id: <1445625664-30873-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit d1cf5788450e ("rbd: set mapping info earlier") defined rbd_dev_mapping_clear(), but, just a few days after, commit f35a4dee14c3 ("rbd: set the mapping size and features later") moved rbd_dev_mapping_set() calls and added another rbd_dev_mapping_clear() call instead of moving the old one. Around the same time, another duplicate was introduced in rbd_dev_device_release() - kill both. Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index cf087c5a6aa5..f8f4beb72b84 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5251,8 +5251,6 @@ err_out_blkdev: unregister_blkdev(rbd_dev->major, rbd_dev->name); err_out_id: rbd_dev_id_put(rbd_dev); - rbd_dev_mapping_clear(rbd_dev); - return ret; } @@ -5507,7 +5505,6 @@ static void rbd_dev_device_release(struct rbd_device *rbd_dev) if (!single_major) unregister_blkdev(rbd_dev->major, rbd_dev->name); rbd_dev_id_put(rbd_dev); - rbd_dev_mapping_clear(rbd_dev); } static void rbd_dev_remove_parent(struct rbd_device *rbd_dev)