diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-04-02 14:08:24 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-04-02 14:08:24 +0100 |
| commit | 2c4cf33f78c395516bed25d32769dedc0c7b4e83 (patch) | |
| tree | 02b5d45f31f418d7ec871e14882b63c67fa48f51 /queue-3.16 | |
| parent | 1cc2008d2ffee849f28ee1de08f7cc207c8af6cb (diff) | |
| download | linux-stable-queue-2c4cf33f78c395516bed25d32769dedc0c7b4e83.tar.gz | |
Drop gfs2 patch that has been reverted upstream
Diffstat (limited to 'queue-3.16')
| -rw-r--r-- | queue-3.16/gfs2-fix-loop-in-gfs2_rbm_find.patch | 32 | ||||
| -rw-r--r-- | queue-3.16/series | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/queue-3.16/gfs2-fix-loop-in-gfs2_rbm_find.patch b/queue-3.16/gfs2-fix-loop-in-gfs2_rbm_find.patch deleted file mode 100644 index 54ba4378..00000000 --- a/queue-3.16/gfs2-fix-loop-in-gfs2_rbm_find.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Andreas Gruenbacher <agruenba@redhat.com> -Date: Tue, 4 Dec 2018 15:06:27 +0100 -Subject: gfs2: Fix loop in gfs2_rbm_find - -commit 2d29f6b96d8f80322ed2dd895bca590491c38d34 upstream. - -Fix the resource group wrap-around logic in gfs2_rbm_find that commit -e579ed4f44 broke. The bug can lead to unnecessary repeated scanning of the -same bitmaps; there is a risk that future changes will turn this into an -endless loop. - -Fixes: e579ed4f44 ("GFS2: Introduce rbm field bii") -Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> -Signed-off-by: Bob Peterson <rpeterso@redhat.com> -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - fs/gfs2/rgrp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/fs/gfs2/rgrp.c -+++ b/fs/gfs2/rgrp.c -@@ -1664,9 +1664,9 @@ static int gfs2_rbm_find(struct gfs2_rbm - goto next_iter; - } - if (ret == -E2BIG) { -+ n += rbm->bii - initial_bii; - rbm->bii = 0; - rbm->offset = 0; -- n += (rbm->bii - initial_bii); - goto res_covered_end_of_rgrp; - } - return ret; diff --git a/queue-3.16/series b/queue-3.16/series index 0d27e046..2f33a758 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -27,7 +27,6 @@ mips-bpf-fix-encoding-bug-for-mm_srlv32_op.patch scsi-zfcp-fix-posting-too-many-status-read-buffers-leading-to.patch sata_rcar-fix-deferred-probing.patch tools-lib-lockdep-rename-trywlock-into-trywrlock.patch -gfs2-fix-loop-in-gfs2_rbm_find.patch alsa-emux-fix-potential-spectre-v1-vulnerabilities.patch alsa-pcm-fix-potential-spectre-v1-vulnerability.patch crypto-user-support-incremental-algorithm-dumps.patch |