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@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>. > >>> > >>> 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? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html