From patchwork Wed Feb 18 13:27:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 5844001 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 D519C9F373 for ; Wed, 18 Feb 2015 13:27:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 215B52026C for ; Wed, 18 Feb 2015 13:27:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4677620266 for ; Wed, 18 Feb 2015 13:27:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751035AbbBRN13 (ORCPT ); Wed, 18 Feb 2015 08:27:29 -0500 Received: from mail-la0-f43.google.com ([209.85.215.43]:44058 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbbBRN13 (ORCPT ); Wed, 18 Feb 2015 08:27:29 -0500 Received: by lams18 with SMTP id s18so1049945lam.11 for ; Wed, 18 Feb 2015 05:27:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=lAj6IP9x/FvT4ReUjDWpMhqRqME+JEkt9V2ZF48fayo=; b=ZLMu79eQaNT5y8N5MhzGRdgtdFS7KhoCl/m37G4XW1CDi3J1/Xgmu/MNHG9RuV0/XO o+CIo99Dnf/PVM2jRjc0Ao0APT2tw7V0GLKJVXA51GYZD0cuj2Mmd/Evd5C6/7q1oWcK 3qWy0pDN6YjMcPYPesGD+RN0rbim2qYvk+e8oj+W6M1J3c6GGnLLK1LRwBTp7vi9qZYw AL3RBLWFW8Aec3b0QnAV5HVnWRUWb9vizr7qxbU/YbISJ5O4oFXqKbVkYSs/TIW8W903 bl17s+3mOU4QiWcc9ULns7h9hlFedQx0wvckvEX/IzoE+QwRQubORkmSDcukgpM8wsdE aVxg== X-Received: by 10.112.135.196 with SMTP id pu4mr33089569lbb.41.1424266047877; Wed, 18 Feb 2015 05:27:27 -0800 (PST) Received: from localhost.localdomain ([185.16.31.201]) by mx.google.com with ESMTPSA id n9sm4207482lbp.0.2015.02.18.05.27.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Feb 2015 05:27:27 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Alex Elder Subject: [PATCH] libceph: kfree() in put_osd() shouldn't depend on authorizer Date: Wed, 18 Feb 2015 16:27:19 +0300 Message-Id: <1424266039-40851-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.9.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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 a255651d4cad ("ceph: ensure auth ops are defined before use") made kfree() in put_osd() conditional on the authorizer. A mechanical mistake most likely - fix it. Cc: Alex Elder Signed-off-by: Ilya Dryomov Reviewed-by: Sage Weil Reviewed-by: Alex Elder --- net/ceph/osd_client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index f693a2f8ac86..41a4abc7e98e 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1035,10 +1035,11 @@ static void put_osd(struct ceph_osd *osd) { dout("put_osd %p %d -> %d\n", osd, atomic_read(&osd->o_ref), atomic_read(&osd->o_ref) - 1); - if (atomic_dec_and_test(&osd->o_ref) && osd->o_auth.authorizer) { + if (atomic_dec_and_test(&osd->o_ref)) { struct ceph_auth_client *ac = osd->o_osdc->client->monc.auth; - ceph_auth_destroy_authorizer(ac, osd->o_auth.authorizer); + if (osd->o_auth.authorizer) + ceph_auth_destroy_authorizer(ac, osd->o_auth.authorizer); kfree(osd); } }