diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre/3.12-btrfs-relocate-csums.patch | 63 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 19 |
2 files changed, 6 insertions, 76 deletions
diff --git a/libre/linux-libre/3.12-btrfs-relocate-csums.patch b/libre/linux-libre/3.12-btrfs-relocate-csums.patch deleted file mode 100644 index 7209276ef..000000000 --- a/libre/linux-libre/3.12-btrfs-relocate-csums.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001 -From: Josef Bacik <jbacik@fusionio.com> -Date: Fri, 27 Sep 2013 13:33:09 +0000 -Subject: Btrfs: relocate csums properly with prealloc extents - -A user reported a problem where they were getting csum errors when running a -balance and running systemd's journal. This is because systemd is awesome and -fallocate()'s its log space and writes into it. Unfortunately we assume that -when we read in all the csums for an extent that they are sequential starting at -the bytenr we care about. This obviously isn't the case for prealloc extents, -where we could have written to the middle of the prealloc extent only, which -means the csum would be for the bytenr in the middle of our range and not the -front of our range. Fix this by offsetting the new bytenr we are logging to -based on the original bytenr the csum was for. With this patch I no longer see -the csum errors I was seeing. Thanks, - -Cc: stable@vger.kernel.org -Reported-by: Chris Murphy <lists@colorremedies.com> -Signed-off-by: Josef Bacik <jbacik@fusionio.com> -Signed-off-by: Chris Mason <chris.mason@fusionio.com> ---- -diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c -index dec4f5a..0359eec 100644 ---- a/fs/btrfs/relocation.c -+++ b/fs/btrfs/relocation.c -@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len) - struct btrfs_root *root = BTRFS_I(inode)->root; - int ret; - u64 disk_bytenr; -+ u64 new_bytenr; - LIST_HEAD(list); - - ordered = btrfs_lookup_ordered_extent(inode, file_pos); -@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len) - if (ret) - goto out; - -- disk_bytenr = ordered->start; - while (!list_empty(&list)) { - sums = list_entry(list.next, struct btrfs_ordered_sum, list); - list_del_init(&sums->list); - -- sums->bytenr = disk_bytenr; -- disk_bytenr += sums->len; -+ /* -+ * We need to offset the new_bytenr based on where the csum is. -+ * We need to do this because we will read in entire prealloc -+ * extents but we may have written to say the middle of the -+ * prealloc extent, so we need to make sure the csum goes with -+ * the right disk offset. -+ * -+ * We can do this because the data reloc inode refers strictly -+ * to the on disk bytes, so we don't have to worry about -+ * disk_len vs real len like with real inodes since it's all -+ * disk length. -+ */ -+ new_bytenr = ordered->start + (sums->bytenr - disk_bytenr); -+ sums->bytenr = new_bytenr; - - btrfs_add_ordered_sum(inode, ordered, sums); - } --- -cgit v0.9.2 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 5dc34d0df..95d128770 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200328 2013-11-26 10:43:40Z tpowa $ +# $Id: PKGBUILD 200607 2013-11-29 20:36:04Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.12 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} -pkgrel=3 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,10 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'criu-no-expert.patch' - '3.12-btrfs-relocate-csums.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('254f59707b6676b59ce5ca5c3c698319' - '0e52518b2bdf3aa7af0c63a4acfd7957' + '04409dbb613b3b28d69b1558299aa892' '7cadb85598587ca85b84005420836a01' 'b15bd4bf2bd8984f3c52b81f005f3c14' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -42,8 +41,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319' '44260d2cb1a8b51c119d2ce1f83e457a' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '923c1728634d4e0f7b77177c36d94791' - '452c06684f07bfa9a478263e1c8649af') + '5213fdb7f5b119d347acb3589817e4f6') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -75,11 +73,6 @@ prepare() { # patch from fedora patch -Np1 -i "${srcdir}/criu-no-expert.patch" - # fix btrfs balance bug - # https://bugzilla.kernel.org/show_bug.cgi?id=63411 - # https://bugs.archlinux.org/task/37867 - patch -Np1 -i "${srcdir}/3.12-btrfs-relocate-csums.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ |