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.
This commit is contained in:
Mathijs Kwik 2013-08-07 06:30:54 +02:00
parent 31648f889d
commit 59025453e7
2 changed files with 12 additions and 0 deletions

View file

@ -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";
};
};
}

View file

@ -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