diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-06-30 22:10:13 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 22:30:44 +0200 |
commit | f7c2df9b55212d5ec94169a4de11e44c683e0af4 (patch) | |
tree | 82021e6e36269780bb8fea3a0603b2841cc5b462 /fs | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 (diff) | |
download | linux-f7c2df9b55212d5ec94169a4de11e44c683e0af4.tar.xz linux-f7c2df9b55212d5ec94169a4de11e44c683e0af4.zip |
AFS: Fix lock imbalance
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 <jirislaby@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | 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 210acafe4a9b..3ff8bdd18fb3 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; } |