Received: by 10.213.65.68 with SMTP id h4csp618301imn; Fri, 30 Mar 2018 12:00:48 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+OdPjJVenYJmlC0/WjPiRcJ64L9TWIVVvsgEIlWo/obQw5IeH+Ti3zNDu1h5Yun05CwKo8 X-Received: by 2002:a17:902:8545:: with SMTP id d5-v6mr218063plo.20.1522436448121; Fri, 30 Mar 2018 12:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522436448; cv=none; d=google.com; s=arc-20160816; b=BZcsEk8amcYOPQDS3WsREgEuMYXOp9XGMrHP5gU3x2r0y5sWsiesW+UclR49OCWMUM yHP15r3MdBk1rn1/Gd03scXohk6Y/874ukksu3owhrOGWvz1GOt8RkzHWri+vOyIUWUp MlBg2B9KhccjK7DluvM3+z8D84qsMou39v7lVm4RwBw29oIMuVKUR3D9n02h1Acw60eo 9AGLs0YQviIlCt00V0kq3I+PWZZQ3V+Zf891qNd/kg28dTIxyxy/Ajliv/RBzUW/PmaO OTXmQjK0TgYGFk33iKtW9UzpkHvfjd0inW2VpIemGwV+jcFYZkOb7T6I7xZ+s/x5ncOI zFdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :message-id:in-reply-to:subject:cc:to:from:date:dkim-signature :arc-authentication-results; bh=7nlS8zOgVz0DZso8tUONr+YS5UXjC6KNm4ao5aC2JYY=; b=XuhDVatnm5TOqxVY3ZPlNZnmjbX5/fSe1eNTyCr2tDe+mPSLhmWgSKKfGW010EPyp0 N0xH2MqXylPFdHcGO8o5M8ldQaOP9nNFFn4LAkODpYljkNPthqe52vO2f1HikUt9ijKW DRj57xtMvBLNeRPofMO/4xvms6Y1zdO9G5joPL9YghMdUxEncKXGzzk9QeGCbsI5rcfm eY7o/nfGcYynNdT8il4Z0oNwPZ0sbigHZ6orwRwg1LmsC9CXeDXdPWn5OE9LxCqAQfWp iujcDUN5It/dTeD6LG6goCkr8FxlmenCLosTuetAUauNkQyHRMU1aP21urcVOwFNLSMx BIXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=uugA9gOi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g1-v6si8985770plm.747.2018.03.30.12.00.34; Fri, 30 Mar 2018 12:00:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=uugA9gOi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbeC3S7F (ORCPT + 99 others); Fri, 30 Mar 2018 14:59:05 -0400 Received: from casper.infradead.org ([85.118.1.10]:46216 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752188AbeC3S7D (ORCPT ); Fri, 30 Mar 2018 14:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Message-ID:In-Reply-To:Subject:cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7nlS8zOgVz0DZso8tUONr+YS5UXjC6KNm4ao5aC2JYY=; b=uugA9gOi9OpDs97HwkBufJ5mP DUDw9O2HSqjNVQf56N5oxFbAuVpkV+/E7YtcMk3Tx1cy5qhQOZLQISFqK8Qyy/butgQWTSR9GqZf7 hJvvp+ATdx1Rju/jRPcouyeKAGPHrrN+gIXTbs3ORnnyu9DCNRptQtCNI/lpkFX3uUnuPVAGGCiP8 3pcwhX2cuFUd4T0VGB5RlPiPV60ti4Jc1qQ76FUJBi2rKUk1ZKFV0hr8eTFpMka+ardDLlg7+ycxy OUDgGbP3Lb+xtN80ksNgYNSi1/pAR7ZxtS/pqwmvB+KnMhivSTCBiQEngYXqXy75at3tb6NlhJQqd neI3nkZKQ==; Received: from jsimmons (helo=localhost) by casper.infradead.org with local-esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f1zEp-0002es-3e; Fri, 30 Mar 2018 18:59:00 +0000 Date: Fri, 30 Mar 2018 19:58:58 +0100 (BST) From: James Simmons To: NeilBrown cc: Oleg Drokin , Greg Kroah-Hartman , Andreas Dilger , Linux Kernel Mailing List , Lustre Development List Subject: Re: [PATCH 07/17] staging: lustre: ldlm: free resource when ldlm_lock_create() fails. In-Reply-To: <152229760844.27689.4330202028940942080.stgit@noble> Message-ID: References: <152229732768.27689.4800156943561963977.stgit@noble> <152229760844.27689.4330202028940942080.stgit@noble> User-Agent: Alpine 2.21 (LFD 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180330_195859_138900_75C14FE4 X-CRM114-Status: GOOD ( 13.97 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 NO_RELAYS Informational: message was not relayed via SMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > ldlm_lock_create() gets a resource, but don't put it on > all failure paths. It should. Reviewed-by: James Simmons > Signed-off-by: NeilBrown > --- > drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c > index b8fd778d9832..614caa4a9b0e 100644 > --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c > +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c > @@ -1551,8 +1551,10 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, > return ERR_CAST(res); > > lock = ldlm_lock_new(res); > - if (!lock) > + if (!lock) { > + ldlm_resource_putref(res); > return ERR_PTR(-ENOMEM); > + } > > lock->l_req_mode = mode; > lock->l_ast_data = data; > @@ -1595,6 +1597,8 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, > return ERR_PTR(rc); > } > > + > + > /** > * Enqueue (request) a lock. > * On the client this is called from ldlm_cli_enqueue_fini > > >