From: Pavel Emelyanov <xemul@openvz.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Subject: Re: [PATCH] Fix messed hunks in generic_setlease
Date: Tue, 25 Sep 2007 12:30:56 +0400 [thread overview]
Message-ID: <46F8C740.6040003@openvz.org> (raw)
In-Reply-To: <20070925010728.b65e5b27.akpm@linux-foundation.org>
Andrew Morton wrote:
> On Tue, 25 Sep 2007 11:57:45 +0400 Pavel Emelyanov <xemul@openvz.org> wrote:
>
>> I have noticed, that one hunk was lost and one duplicated
>> during merging the fix-potential-oops-in-generic_setlease(-xxx)
>> patches. One of the fixes is already in the hot-fixes, but the
>> second one is still lost.
>>
>> The returned pointer was not the one allocated, but some temporary
>> used to scan through the inode's locks list. This caused and OOPS
>> during Kamalesh's testing.
>>
>> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
>>
>> ---
>>
>> diff --git a/fs/locks.c b/fs/locks.c
>> index c0fe71a..c1198e3 100644
>> --- a/fs/locks.c
>> +++ b/fs/locks.c
>> @@ -1423,7 +1418,7 @@ int generic_setlease(struct file *filp,
>> locks_copy_lock(new_fl, lease);
>> locks_insert_lock(before, new_fl);
>>
>> - *flp = fl;
>> + *flp = new_fl;
>> return 0;
>>
>> out:
>
> argh, what a mess - there are way too many trees playing with fs/locks.c.
>
> umm, I think this is not a mismerge and that the original patch
> (http://lkml.org/lkml/2007/9/20/141) had this bug in it.
Indeed... :(
> And I've just sent that buggy patch to Linus. Do you agree?
Shame on me... Sorry :(
(going to the blackboard to write "I will check my patches twice before
sending them to Andrew" for 100 times)
next prev parent reply other threads:[~2007-09-25 8:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-25 7:57 [PATCH] Fix messed hunks in generic_setlease Pavel Emelyanov
2007-09-25 8:07 ` Andrew Morton
2007-09-25 8:30 ` Pavel Emelyanov [this message]
2007-09-25 10:38 ` Kamalesh Babulal
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=46F8C740.6040003@openvz.org \
--to=xemul@openvz.org \
--cc=akpm@linux-foundation.org \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.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