From: lists@colorremedies.com
To: Chris Murphy <lists@colorremedies.com>
Cc: fdmanana@gmail.com, Btrfs BTRFS <linux-btrfs@vger.kernel.org>
Subject: Re: [BUG] btrfs send/receive, page allocation failure
Date: Mon, 11 Aug 2014 10:41:43 -0600 [thread overview]
Message-ID: <6316ceac72f53e0500b28f60ef280ad6@colorremedies.com> (raw)
In-Reply-To: <A0E5F699-0F52-4CD4-B60E-42010C6C3361@colorremedies.com>
On 2014-08-11 10:25, Chris Murphy wrote:
> On Aug 11, 2014, at 10:04 AM, Filipe David Manana <fdmanana@gmail.com>
> wrote:
>
>> On Mon, Aug 11, 2014 at 4:55 PM, Chris Murphy
>> <lists@colorremedies.com> wrote:
>>>
>>> On Aug 11, 2014, at 2:46 AM, Filipe David Manana <fdmanana@gmail.com>
>>> wrote:
>>>
>>>> On Mon, Aug 11, 2014 at 4:07 AM, Chris Murphy
>>>> <lists@colorremedies.com> wrote:
>>>>>>
>>>>>>
>>>>>> Can you try the following patch and confirm if it helps?
>>>>>> https://patchwork.kernel.org/patch/4705171/
>>>>>
>>>>> This one applies without problems, I didn't build it because I saw
>>>>> v4. The v4 patch I get:
>>>>>
>>>>> + patch -p1 -F1 -s
>>>>> 4 out of 4 hunks FAILED -- saving rejects to file
>>>>> fs/btrfs/send.c.rej
>>>>>
>>>>> Should v4 alone be applied over 3.16.0? Or each version in
>>>>> succession?
>>>>
>>>> Alone. How did you try to apply it to 3.16?
>>>
>>> rpmbuild
>>> https://fedoraproject.org/wiki/Building_a_custom_kernel
>>>
>>> Gist is, save the patch, create patch filename entry into
>>> kernel.spec, then run rpmbuild. rpmbuild uses 'patch -p1 -F1 -s' to
>>> apply the patch. The v1 patch applies, as does Liu Bo's patch from
>>> July 29 "Btrfs: fix regression of btrfs device replace" which I was
>>> also going to test. But the v4 patch isn't applying.
>>>
>>>> Try "cd source_dir && git
>>>> am patchfile" if you didn't (e.g. you used patch command directly).
>>>
>>> I'd kinda prefer to build an rpm since I need to test it on baremetal
>>> for this bug, and a VM for the device replace bug.
>>
>> Sorry, I don't know anything about fedora's way of kernel patching.
>> Either way, it seems the problem is simple to solve:
>>
>> git clone
>> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
>> git checkout v3.16
>> git am /path/to/my_patch_file
>> git diff HEAD^..HEAD > /tmp/diff
>>
>> The resulting patch file [1] /tmp/diff then applies cleanly with
>> "patch -p1 -F1 -s"
>>
>> https://friendpaste.com/Bgwdjk31P3pZHtArr341G
>
> OK that friendpaste is completely different than the [PATCH v4] email.
>
> # from above URL
> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> index 6528aa6..95891c0 100644
>
> # from [PATCH v4] email
> diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> index 3c63b29..b29fc5c 100644
>
> The lines numbers are all completely different also. I'll try the
> patch from the above URL.
The above friendpaste URL patch has applied, and I'm now building.
Chris Murphy
next prev parent reply other threads:[~2014-08-11 16:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-07 15:31 [BUG] btrfs send/receive, page allocation failure Chris Murphy
2014-08-10 21:01 ` Chris Murphy
2014-08-10 23:44 ` Filipe David Manana
2014-08-11 3:07 ` Chris Murphy
2014-08-11 8:46 ` Filipe David Manana
2014-08-11 15:55 ` Chris Murphy
2014-08-11 16:04 ` Filipe David Manana
2014-08-11 16:25 ` Chris Murphy
2014-08-11 16:41 ` lists [this message]
2014-08-11 20:30 ` Chris Murphy
2014-08-11 20:51 ` Filipe David Manana
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=6316ceac72f53e0500b28f60ef280ad6@colorremedies.com \
--to=lists@colorremedies.com \
--cc=fdmanana@gmail.com \
--cc=linux-btrfs@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;
as well as URLs for NNTP newsgroup(s).