On 12/12/2015 10:02 PM, Filipe Manana wrote:
> 
> 
> On 12/12/2015 09:43 PM, Greg KH wrote:
>> On Sat, Dec 12, 2015 at 09:35:45PM +0000, Filipe Manana wrote:
>>>
>>>
>>> On 12/12/2015 08:03 PM, Greg KH wrote:
>>>> On Sat, Dec 12, 2015 at 11:57:49AM -0800, Greg KH wrote:
>>>>> On Sat, Dec 12, 2015 at 02:32:10PM +0000, Filipe Manana wrote:
>>>>>>
>>>>>>
>>>>>> On 12/11/2015 04:54 PM, gregkh@linuxfoundation.org wrote:
>>>>>>>
>>>>>>> The patch below does not apply to the 4.2-stable tree.
>>>>>>> If someone wants it applied there, or to any other stable or longterm
>>>>>>> tree, then please email the backport, including the original git commit
>>>>>>> id to <stable@vger.kernel.org>.
>>>>>>
>>>>>> Greg, please find attached a version of the patch that applies against
>>>>>> 4.2.7.
>>>>>
>>>>> This patch breaks the build:
>>>
>>> I did build and tested it (in reply to your next comment about sending
>>> untested stuff).
>>> See comment inlined below.
>>>
>>>>>
>>>>> fs/btrfs/delayed-ref.c: In function ‘merge_ref’:
>>>>> fs/btrfs/delayed-ref.c:223:38: error: ‘struct btrfs_delayed_ref_node’ has no mem
>>>>> ber named ‘no_quota’
>>>>>    if (next->type != ref->type || next->no_quota != ref->no_quota)
>>>
>>> I don't get why you're getting that error.
>>> struct btrfs_delayed_ref_node has a member named 'no_quota':
>>>
>>> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/fs/btrfs/delayed-ref.h?id=refs/tags/v4.2.7#n36
>>>
>>> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/fs/btrfs/delayed-ref.h?id=refs/tags/v4.2.7#n71
>>>
>>> Am I missing something?
>>>
>>> I think you applied 2 patches in the wrong order. You should apply the
>>> following two in this order:
>>>
>>> 1) "Btrfs: fix regression when running delayed references" -
>>> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2c3cf7d5f6105bb957df125dfce61d4483b8742d
>>>
>>> 2) "Btrfs: fix regression running delayed references when using qgroups"
>>> -
>>> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=b06c4bf5c874a57254b197f53ddf588e7a24a2bf
>>>
>>> Please confirm if you applied those 2 in that specific order, because it
>>> doesn't seem so. The first one adds code that still uses member
>>> "no_quota" while the second one removes the "no_quota" member from that
>>> struct.
>>
>> You only sent me one patch, one for both trees.  I built the tree after
>> applying what I had from you.
>>
>> If you need/want me to apply 2 patches, please send both of them, can
>> you do so for the -rc kernels I just released?
> 
> I didn't send both patches because for the first one there wasn't any
> complain about it not applying cleanly to the 4.2 and 4.3 trees. So I
> only sent the second one, since that was the only one that didn't apply
> cleanly.
> 
> Ok, I'll do it again, based on those rcs, and send you both patches for
> both stable releases. Where are those rc branches?
> 
> thanks

Ok, here are (as attachments) the 2 patches for 4.2 and 4.3 that should
apply cleanly against what's in your queues. The file names reflect the
release and order:

0001-4.2.7-Btrfs-fix-regression-when-running-delayed-references.patch
0001-4.3.2-Btrfs-fix-regression-when-running-delayed-references.patch
0002-4.2.7-Btrfs-fix-regression-running-delayed-references-when.patch
0002-4.3.2-Btrfs-fix-regression-running-delayed-references-when.patch

Thanks

> 
>>
>> thanks,
>>
>> greg k-h
>>