From patchwork Wed Nov 18 08:28:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 60934 X-Patchwork-Delegate: ericvh@gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAI8TVCd031954 for ; Wed, 18 Nov 2009 08:29:31 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by 3yr0jf1.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NAfum-0004yI-PT; Wed, 18 Nov 2009 08:29:24 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by 3yr0jf1.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NAful-0004y1-BO for v9fs-developer@lists.sourceforge.net; Wed, 18 Nov 2009 08:29:23 +0000 Received-SPF: pass (3b2kzd1.ch3.sourceforge.com: domain of gmail.com designates 74.125.78.146 as permitted sender) client-ip=74.125.78.146; envelope-from=error27@gmail.com; helo=ey-out-1920.google.com; Received: from ey-out-1920.google.com ([74.125.78.146]) by 3b2kzd1.ch3.sourceforge.com with esmtp (Exim 4.69) id 1NAfud-00031f-MX for v9fs-developer@lists.sourceforge.net; Wed, 18 Nov 2009 08:29:23 +0000 Received: by ey-out-1920.google.com with SMTP id 26so116636eyw.2 for ; Wed, 18 Nov 2009 00:29:09 -0800 (PST) Received: by 10.213.23.155 with SMTP id r27mr106553ebb.48.1258532949431; Wed, 18 Nov 2009 00:29:09 -0800 (PST) Received: from bicker.local ([41.222.20.196]) by mx.google.com with ESMTPS id 7sm1128611eyg.41.2009.11.18.00.29.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 18 Nov 2009 00:29:07 -0800 (PST) Date: Wed, 18 Nov 2009 10:28:47 +0200 (SAST) From: Dan Carpenter X-X-Sender: dcarpenter@bicker To: v9fs-developer@lists.sourceforge.net Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Spam-Score: -2.1 (--) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 DKIM_VERIFIED Domain Keys Identified Mail: signature passes verification 0.0 DKIM_SIGNED Domain Keys Identified Mail: message has a signature -0.6 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NAfud-00031f-MX Cc: lucho@ionkov.net, rminnich@sandia.gov, ericvh@gmail.com Subject: [V9fs-developer] [patch] fix double unlock bug X-BeenThere: v9fs-developer@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: v9fs-developer-bounces@lists.sourceforge.net --- orig/fs/9p/vfs_dir.c 2009-11-16 23:30:12.000000000 +0200 +++ devel/fs/9p/vfs_dir.c 2009-11-16 23:33:23.000000000 +0200 @@ -121,6 +121,8 @@ rdir = (struct p9_rdir *) fid->rdir; err = mutex_lock_interruptible(&rdir->mutex); + if (err) + return err; while (err == 0) { if (rdir->tail == rdir->head) { err = v9fs_file_readn(filp, rdir->buf, NULL,