From: "Vladimir B. Savkin" <master@sectorb.msk.ru>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.6.10-rc2
Date: Thu, 18 Nov 2004 20:26:06 +0300 [thread overview]
Message-ID: <20041118172606.GA6729@tentacle.sectorb.msk.ru> (raw)
In-Reply-To: <Pine.LNX.4.58.0411141835150.2222@ppc970.osdl.org>
On Sun, Nov 14, 2004 at 06:49:04PM -0800, Linus Torvalds wrote:
>
> Ok, the -rc2 changes are almost as big as the -rc1 changes, and we should
> now calm down, so I do not want to see anything but bug-fixes until 2.6.10
> is released. Otherwise we'll never get there.
Please accept this fix:
[PATCH] fix posix_locks_deadlock().
"blocked_list" may contain both leases and flock locks. Since the latter in
particular do not initialize the fl_owner field, we have to beware not to
call posix_same_owner() on them.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>
---
locks.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
Index: linux-2.6.9-rc2-up/fs/locks.c
===================================================================
--- linux-2.6.9-rc2-up.orig/fs/locks.c 2004-09-19 13:55:33.680258334 -0700
+++ linux-2.6.9-rc2-up/fs/locks.c 2004-09-19 15:37:32.595634679 -0700
@@ -634,14 +634,13 @@
int posix_locks_deadlock(struct file_lock *caller_fl,
struct file_lock *block_fl)
{
- struct list_head *tmp;
+ struct file_lock *fl;
next_task:
if (posix_same_owner(caller_fl, block_fl))
return 1;
- list_for_each(tmp, &blocked_list) {
- struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
- if (posix_same_owner(fl, block_fl)) {
+ list_for_each_entry(fl, &blocked_list, fl_link) {
+ if (IS_POSIX(fl) && posix_same_owner(fl, block_fl)) {
fl = fl->fl_next;
block_fl = fl;
goto next_task;
~
:wq
With best regards,
Vladimir Savkin.
next prev parent reply other threads:[~2004-11-18 17:38 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-15 2:49 Linux 2.6.10-rc2 Linus Torvalds
2004-11-15 4:07 ` 2.6.10-rc2 doesn't boot Adrian Bunk
2004-11-15 4:48 ` Linus Torvalds
2004-11-15 5:29 ` Adrian Bunk
2004-11-15 23:27 ` Chris Wright
2004-11-15 23:58 ` Andrew Morton
2004-11-18 23:14 ` 2.6.10-rc2 doesn't boot (if no floppy device) Len Brown
2004-11-19 7:09 ` Chris Wright
2004-11-20 9:02 ` Len Brown
2004-11-20 12:40 ` Adrian Bunk
2004-11-20 18:28 ` Linus Torvalds
2004-11-20 19:10 ` Linus Torvalds
2004-11-22 19:55 ` Len Brown
2004-11-24 16:26 ` Alan Cox
2004-11-21 16:29 ` Adrian Bunk
2004-11-22 19:29 ` Len Brown
2004-11-22 20:02 ` Linus Torvalds
2004-11-22 20:10 ` Linus Torvalds
2004-11-22 20:38 ` Len Brown
2004-11-23 2:45 ` Linus Torvalds
2004-11-23 4:57 ` Linus Torvalds
2004-11-23 7:06 ` Len Brown
2004-11-23 20:13 ` Stian Jordet
2004-11-23 2:00 ` Chris Wright
2004-11-22 18:28 ` Len Brown
2004-11-23 0:46 ` Adrian Bunk
2004-11-23 1:07 ` why use ACPI (Re: 2.6.10-rc2 doesn't boot (if no floppy device)) Len Brown
2004-11-23 1:23 ` Dave Jones
2004-11-23 1:52 ` Adrian Bunk
2004-11-23 1:37 ` Adrian Bunk
2004-11-23 2:47 ` Len Brown
2004-11-23 2:50 ` Dave Jones
2004-11-23 3:13 ` Gene Heskett
2004-11-23 3:45 ` Dave Jones
2004-11-20 16:41 ` 2.6.10-rc2 doesn't boot (if no floppy device) Linus Torvalds
2004-11-22 19:07 ` Len Brown
2004-11-22 19:23 ` Linus Torvalds
2004-11-22 20:24 ` Len Brown
2004-11-22 20:31 ` Linus Torvalds
2004-11-22 20:36 ` Linus Torvalds
2004-11-22 20:54 ` Len Brown
2004-11-22 20:51 ` Len Brown
2004-11-23 1:58 ` Chris Wright
2004-11-19 13:47 ` Adrian Bunk
2004-11-23 1:57 ` Chris Wright
2004-11-15 7:25 ` 2.6.10-rc2 doesn't boot Andrew Morton
2004-11-15 10:26 ` Linux 2.6.10-rc2 Russell King
2004-11-15 11:24 ` Ben Dooks
2004-11-15 11:55 ` Nick Piggin
2004-11-15 20:20 ` Andrew Morton
2004-11-16 0:29 ` Linux 2.6.10-rc2 [dvb-bt8xx unload oops] Eyal Lebedinsky
2004-11-16 9:57 ` Eyal Lebedinsky
2004-11-17 23:17 ` Eyal Lebedinsky
2004-11-16 7:55 ` Linux 2.6.10-rc2 SAVAGEFB startup crash Philipp Matthias Hahn
2004-11-16 8:17 ` Colin Leroy
2004-11-16 12:43 ` Antonino A. Daplas
2004-11-16 17:27 ` Philipp Matthias Hahn
2004-11-16 21:20 ` Antonino A. Daplas
2004-11-17 11:55 ` Philipp Matthias Hahn
2004-11-16 21:43 ` Antonino A. Daplas
2004-11-16 16:25 ` Linux 2.6.10-rc2 Guido Guenther
2004-11-17 15:54 ` Andrew Walrond
2004-11-17 16:58 ` Linux 2.6.10-rc2 OOPS on boot with 3ware + reiserfs Vladimir B. Savkin
[not found] ` <Pine.LNX.4.58.0411170935040.2222@ppc970.osdl.org>
[not found] ` <20041118103526.GC26240@suse.de>
2004-11-18 16:02 ` Vladimir B. Savkin
2004-11-18 18:39 ` Jens Axboe
2004-11-18 19:10 ` Jens Axboe
2004-11-18 19:22 ` James Bottomley
2004-11-18 21:32 ` Jens Axboe
2004-11-18 21:39 ` James Bottomley
2004-11-19 8:40 ` Jens Axboe
2004-11-17 19:32 ` Linux 2.6.10-rc2 start_udev very slow Andrew Walrond
2004-11-17 23:13 ` Greg KH
2004-12-16 15:56 ` Greg KH
2004-12-16 20:57 ` Andrew Walrond
2004-12-16 21:11 ` Greg KH
2004-12-16 21:20 ` Andrew Walrond
2004-12-16 21:46 ` Greg KH
2004-11-18 17:26 ` Vladimir B. Savkin [this message]
2004-11-18 17:59 ` Linux 2.6.10-rc2 Linus Torvalds
2004-11-18 18:01 ` Matthew Wilcox
2004-11-19 8:43 ` Vladimir B. Savkin
2004-11-15 20:23 Paul Blazejowski
2004-11-15 21:16 ` Lee Revell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041118172606.GA6729@tentacle.sectorb.msk.ru \
--to=master@sectorb.msk.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).