From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753564Ab2HDHpO (ORCPT ); Sat, 4 Aug 2012 03:45:14 -0400 Received: from mga11.intel.com ([192.55.52.93]:60649 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750695Ab2HDHpJ (ORCPT ); Sat, 4 Aug 2012 03:45:09 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="193141061" Date: Sat, 4 Aug 2012 15:45:02 +0800 From: Fengguang Wu To: Josef Bacik Cc: Chris Mason , BTRFS FILE SYSTEM , LKML Subject: [PATCH] btrfs: fix second lock in btrfs_delete_delayed_items() Message-ID: <20120804074502.GB13700@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix a real bug caught by coccinelle. fs/btrfs/delayed-inode.c:1013:1-11: second lock on line 1013 Signed-off-by: Fengguang Wu --- fs/btrfs/delayed-inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- linux.orig/fs/btrfs/delayed-inode.c 2012-08-03 15:36:21.763560787 +0800 +++ linux/fs/btrfs/delayed-inode.c 2012-08-04 15:37:33.370210331 +0800 @@ -1028,9 +1028,10 @@ do_again: btrfs_release_delayed_item(prev); ret = 0; btrfs_release_path(path); - if (curr) + if (curr) { + mutex_unlock(&node->mutex); goto do_again; - else + } else goto delete_fail; }