From 59025453e71f88196eaff142ff3443f99cda8f44 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 7 Aug 2013 06:30:54 +0200 Subject: [PATCH] linux-3.10: backport a fix for "btrfs send" It has been submitted for inclusion in mainline, so it will probably make it into 3.11 (or 3.12 as 3.11 is fairly close to release). It is very local, only affecting people who use the "send" feature. Without it, send is unstable/unsafe to use incrementally. It can probably be applied to 3.9 and 3.8 as well, but as I only tested it against 3.10, so I didn't bother. --- pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c77785167cc1..e1ec4a55718e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -139,4 +139,15 @@ rec { }; }; + # this patch will probably make it into 3.11 or 3.12 + # it only touches 1 file (fs/btrfs/send.c) so it only affects people that use + # the btrfs send feature. + btrfs_send_backport = + { name = "btrfs-send-check-parent-dir-when-doing-a-compare-send"; + patch = fetchurl { + url = https://patchwork.kernel.org/patch/2839612/mbox; + sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a366b24193a..53c3ba9ec73a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6454,6 +6454,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 + kernelPatches.btrfs_send_backport ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill