diff options
Diffstat (limited to 'kernels/linux-libre-lts-grsec')
| -rw-r--r-- | kernels/linux-libre-lts-grsec/0001-fix-btrfs-mount-deadlock.patch | 43 | ||||
| -rw-r--r-- | kernels/linux-libre-lts-grsec/PKGBUILD | 14 |
2 files changed, 4 insertions, 53 deletions
diff --git a/kernels/linux-libre-lts-grsec/0001-fix-btrfs-mount-deadlock.patch b/kernels/linux-libre-lts-grsec/0001-fix-btrfs-mount-deadlock.patch deleted file mode 100644 index 9430d5833..000000000 --- a/kernels/linux-libre-lts-grsec/0001-fix-btrfs-mount-deadlock.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9c4f61f01d269815bb7c37be3ede59c5587747c6 Mon Sep 17 00:00:00 2001 -From: David Sterba <dsterba@suse.cz> -Date: Fri, 2 Jan 2015 19:12:57 +0100 -Subject: btrfs: simplify insert_orphan_item - -We can search and add the orphan item in one go, -btrfs_insert_orphan_item will find out if the item already exists. - -Signed-off-by: David Sterba <dsterba@suse.cz> - -diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c -index 5be45c1..25a1c36 100644 ---- a/fs/btrfs/tree-log.c -+++ b/fs/btrfs/tree-log.c -@@ -1254,21 +1254,13 @@ out: - } - - static int insert_orphan_item(struct btrfs_trans_handle *trans, -- struct btrfs_root *root, u64 offset) -+ struct btrfs_root *root, u64 ino) - { - int ret; -- struct btrfs_path *path; -- -- path = btrfs_alloc_path(); -- if (!path) -- return -ENOMEM; - -- ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID, -- offset, BTRFS_ORPHAN_ITEM_KEY, NULL); -- if (ret > 0) -- ret = btrfs_insert_orphan_item(trans, root, offset); -- -- btrfs_free_path(path); -+ ret = btrfs_insert_orphan_item(trans, root, ino); -+ if (ret == -EEXIST) -+ ret = 0; - - return ret; - } --- -cgit v0.10.2 - diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index fa11883be..4ac34d5b5 100644 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -12,9 +12,9 @@ pkgbase=linux-libre-lts-grsec # Build kernel with lts-grsec localname _pkgbasever=3.14-gnu -_pkgver=3.14.38-gnu +_pkgver=3.14.39-gnu _grsecver=3.1 -_timestamp=201504142259 +_timestamp=201504190814 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -45,15 +45,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' - '0001-fix-btrfs-mount-deadlock.patch' # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch '3.14.26-8475f027b4-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '4a309e65e5740d14f0ea601e97afbf387c448376d76d389358d05e4fe318ce45' + 'a85855c6bdefd3067df55bf10e17ea16df5a7b92b1306a36d3b8f2bd02b1568b' 'SKIP' - '1abe9f4209d3af9b5dc6d63685502cb1af30097927c756cea3b42e25d677637e' + '27caa69b2d965f6734564af6ce82fc55d73b75f38036617cb9d04017df03585e' 'SKIP' 'd8d02e727bd240e15cbd61227a128babda150cfb1d2329d4206ff99071817884' '2efe40d528f669e9d82f43ea77727d666dafb2529faa2e9df3eb05657dc4ae9f' @@ -67,7 +66,6 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - '5967cf53cb9db9f070e8f346c3d7045748e4823a7fe2ee330acd18c9d02bbb77' '4637b23fc0cb21520c9da612cd39c38a52bd00c80778e39110fc2e72118f9c10') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -119,10 +117,6 @@ prepare() { # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # fix #44495 and #44385 deadlock on btrfs mount - # https://btrfs.wiki.kernel.org/index.php/Gotchas - patch -Np1 -i "${srcdir}/0001-fix-btrfs-mount-deadlock.patch" - # Adding loongson-community patch if [ "${CARCH}" == "mips64el" ]; then patch -p1 -i ${srcdir}/3.14.26-8475f027b4-loongson-community.patch |