From patchwork Thu Apr 11 06:23:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 16044 Return-Path: X-Original-To: linaro@staging.patches.linaro.org Delivered-To: linaro@staging.patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1BAFB238FF for ; Thu, 11 Apr 2013 13:14:24 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id i13sf844495qae.2 for ; Thu, 11 Apr 2013 06:14:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :date:from:to:message-id:mime-version:user-agent:x-source-ip :x-mailman-approved-at:cc:subject:x-beenthere:x-mailman-version :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-gm-message-state :x-original-sender:x-original-authentication-results:mailing-list :x-google-group-id:content-disposition:content-type :content-transfer-encoding; bh=DGYnTdKI84t8uMZqvl1EoHmW5Y/6r3zAXCKYCdu8e8Y=; b=Igiqvu+TkwZO7tVj2sTh+yGIuEVjIlL01qbcxRkjgVQvFI7WyAMqKXzGYP6J/ejgvM h0oOY0FCH1bXh5aYCAWVxmPomK4zazicfXo3JWKQWj4mFP7rRRcPa8JIYZnrq5gHRnIr XZFX2fFWQEbZyImnsfWoNqx8X53gEzzngt6PBrXTLT0FPWw6rFJKrW96c0QUSMJ5iTfQ U4RxsPfs/Lt1y+YrtF+tqmv8o8oxskl8lwJkE02vsRETCVG67VIWFRzAxQZikpPEh7jT U9sVKanxJnge6f1jhUf2hGuOqC2hDDeDMVKHyvzukubkdk82Jk04GLLSermBMAW1qXnB 4Tqw== X-Received: by 10.236.164.40 with SMTP id b28mr3237959yhl.40.1365686042636; Thu, 11 Apr 2013 06:14:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.127.195 with SMTP id ni3ls784559qeb.1.gmail; Thu, 11 Apr 2013 06:14:02 -0700 (PDT) X-Received: by 10.52.98.5 with SMTP id ee5mr4202233vdb.102.1365686042470; Thu, 11 Apr 2013 06:14:02 -0700 (PDT) Received: from mail-vb0-x22d.google.com (mail-vb0-x22d.google.com [2607:f8b0:400c:c02::22d]) by mx.google.com with ESMTPS id a6si3299391vcx.38.2013.04.11.06.14.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 06:14:02 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22d; Received: by mail-vb0-f45.google.com with SMTP id w15so1236114vbf.18 for ; Thu, 11 Apr 2013 06:14:02 -0700 (PDT) X-Received: by 10.52.71.4 with SMTP id q4mr4218915vdu.8.1365686041899; Thu, 11 Apr 2013 06:14:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp20018veb; Thu, 11 Apr 2013 06:14:01 -0700 (PDT) X-Received: by 10.15.36.2 with SMTP id h2mr17219590eev.2.1365686040092; Thu, 11 Apr 2013 06:14:00 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id m7si6085149eey.102.2013.04.11.06.13.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Apr 2013 06:14:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linaro-mm-sig-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1UQHJY-0007LV-Fi; Thu, 11 Apr 2013 13:13:20 +0000 Received: from userp1040.oracle.com ([156.151.31.81]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1UQAvG-0006ov-VC for linaro-mm-sig@lists.linaro.org; Thu, 11 Apr 2013 06:23:51 +0000 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r3B6OCFF024060 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 11 Apr 2013 06:24:13 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r3B6OBAq004287 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 11 Apr 2013 06:24:12 GMT Received: from abhmt102.oracle.com (abhmt102.oracle.com [141.146.116.54]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r3B6OBZS008159; Thu, 11 Apr 2013 06:24:11 GMT Received: from elgon.mountain (/197.237.137.111) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 10 Apr 2013 23:24:10 -0700 Date: Thu, 11 Apr 2013 09:23:39 +0300 From: Dan Carpenter To: Sumit Semwal Message-ID: <20130411062339.GA7603@elgon.mountain> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] X-Mailman-Approved-At: Thu, 11 Apr 2013 13:13:19 +0000 Cc: Greg Kroah-Hartman , kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, kbuild@01.org, Dave Airlie Subject: [Linaro-mm-sig] [patch 1/2 -next] dma-buf: double unlock in debugfs code X-BeenThere: linaro-mm-sig@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: linaro-mm-sig-bounces@lists.linaro.org Sender: linaro-mm-sig-bounces@lists.linaro.org X-Gm-Message-State: ALoCoQkFaToZMTYNI49KccHLeAr1bTpoj6KP5fPf3ssaxVg3gpM9S7MfpOCabcvaRshNiPBV/82Z X-Original-Sender: dan.carpenter@oracle.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Disposition: inline We unlock here when we failed to take the lock. Signed-off-by: Dan Carpenter Acked-by: Greg Kroah-Hartman --- This is in linux-next, and I think the debugfs code is only in Sumit's tree. diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index 466476f..174cd2c 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -593,7 +593,7 @@ static int dma_buf_describe(struct seq_file *s) if (ret) { seq_printf(s, "\tERROR locking buffer object: skipping\n"); - goto skip_buffer; + continue; } seq_printf(s, "\t"); @@ -618,7 +618,6 @@ static int dma_buf_describe(struct seq_file *s) count++; size += buf_obj->size; -skip_buffer: mutex_unlock(&buf_obj->lock); }