From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760899AbZF2QC0 (ORCPT ); Mon, 29 Jun 2009 12:02:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755000AbZF2QCI (ORCPT ); Mon, 29 Jun 2009 12:02:08 -0400 Received: from smtp.wellnetcz.com ([212.24.148.102]:48797 "EHLO smtp.wellnetcz.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753888AbZF2QCG (ORCPT ); Mon, 29 Jun 2009 12:02:06 -0400 From: Jiri Slaby To: dhowells@redhat.com Cc: linux-afs@lists.infradead.org, viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH 2/5] FS: afs, fix lock imbalance Date: Mon, 29 Jun 2009 18:01:11 +0200 Message-Id: <1246291271-3366-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.3.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't unlock on vfs_rejected_lock path in afs_do_setlk, since the lock is unlocked after abort_attempt label. Signed-off-by: Jiri Slaby --- fs/afs/flock.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 210acaf..3ff8bdd 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c @@ -432,7 +432,6 @@ vfs_rejected_lock: list_del_init(&fl->fl_u.afs.link); if (list_empty(&vnode->granted_locks)) afs_defer_unlock(vnode, key); - spin_unlock(&vnode->lock); goto abort_attempt; } -- 1.6.3.2