drop gfs patch from 4.4 and 3.18

diff --git a/queue-3.18/gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch b/queue-3.18/gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch
deleted file mode 100644 (file)
index 2b20e78..0000000
--- a/queue-3.18/gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From foo@baz Fri Sep 21 09:23:07 CEST 2018
-From: Bob Peterson <rpeterso@redhat.com>
-Date: Mon, 18 Jun 2018 13:24:13 -0500
-Subject: gfs2: Don't reject a supposedly full bitmap if we have blocks reserved
-
-From: Bob Peterson <rpeterso@redhat.com>
-
-[ Upstream commit e79e0e1428188b24c3b57309ffa54a33c4ae40c4 ]
-
-Before this patch, you could get into situations like this:
-
-1. Process 1 searches for X free blocks, finds them, makes a reservation
-2. Process 2 searches for free blocks in the same rgrp, but now the
-   bitmap is full because process 1's reservation is skipped over.
-   So it marks the bitmap as GBF_FULL.
-3. Process 1 tries to allocate blocks from its own reservation, but
-   since the GBF_FULL bit is set, it skips over the rgrp and searches
-   elsewhere, thus not using its own reservation.
-
-This patch adds an additional check to allow processes to use their
-own reservations.
-
-Signed-off-by: Bob Peterson <rpeterso@redhat.com>
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/gfs2/rgrp.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/fs/gfs2/rgrp.c
-+++ b/fs/gfs2/rgrp.c
-@@ -1643,7 +1643,8 @@ static int gfs2_rbm_find(struct gfs2_rbm
- 
-       while(1) {
-               bi = rbm_bi(rbm);
--              if (test_bit(GBF_FULL, &bi->bi_flags) &&
-+              if ((ip == NULL || !gfs2_rs_active(&ip->i_res)) &&
-+                  test_bit(GBF_FULL, &bi->bi_flags) &&
-                   (state == GFS2_BLKST_FREE))
-                       goto next_bitmap;
- 

diff --git a/queue-3.18/series b/queue-3.18/series
index 11b5b4384d6fcf336435fe7d6cd44e09830633c3..c272e233a28f06a2a8a919f390af11c6ce82b6a7 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -65,7 +65,6 @@ xfrm-fix-passing-zero-to-err_ptr-warning.patch
 gfs2-special-case-rindex-for-gfs2_grow.patch
 mips-ath79-fix-system-restart.patch
 mtd-maps-fix-solutionengine.c-printk-format-warnings.patch
-gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch
 fbdev-omapfb-off-by-one-in-omapfb_register_client.patch
 video-goldfishfb-fix-memory-leak-on-driver-remove.patch
 fbdev-via-fix-defined-but-not-used-warning.patch

diff --git a/queue-4.4/gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch b/queue-4.4/gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch
deleted file mode 100644 (file)
index 87ec78a..0000000
--- a/queue-4.4/gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From foo@baz Fri Sep 21 09:28:34 CEST 2018
-From: Bob Peterson <rpeterso@redhat.com>
-Date: Mon, 18 Jun 2018 13:24:13 -0500
-Subject: gfs2: Don't reject a supposedly full bitmap if we have blocks reserved
-
-From: Bob Peterson <rpeterso@redhat.com>
-
-[ Upstream commit e79e0e1428188b24c3b57309ffa54a33c4ae40c4 ]
-
-Before this patch, you could get into situations like this:
-
-1. Process 1 searches for X free blocks, finds them, makes a reservation
-2. Process 2 searches for free blocks in the same rgrp, but now the
-   bitmap is full because process 1's reservation is skipped over.
-   So it marks the bitmap as GBF_FULL.
-3. Process 1 tries to allocate blocks from its own reservation, but
-   since the GBF_FULL bit is set, it skips over the rgrp and searches
-   elsewhere, thus not using its own reservation.
-
-This patch adds an additional check to allow processes to use their
-own reservations.
-
-Signed-off-by: Bob Peterson <rpeterso@redhat.com>
-Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/gfs2/rgrp.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/fs/gfs2/rgrp.c
-+++ b/fs/gfs2/rgrp.c
-@@ -1691,7 +1691,8 @@ static int gfs2_rbm_find(struct gfs2_rbm
- 
-       while(1) {
-               bi = rbm_bi(rbm);
--              if (test_bit(GBF_FULL, &bi->bi_flags) &&
-+              if ((ip == NULL || !gfs2_rs_active(&ip->i_res)) &&
-+                  test_bit(GBF_FULL, &bi->bi_flags) &&
-                   (state == GFS2_BLKST_FREE))
-                       goto next_bitmap;
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index 71c415ceb6ba51749e7957c39e13bced812451df..e2623e0380526ae03e40708fdc62fc06e7736f17 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -9,7 +9,6 @@ dmaengine-pl330-fix-irq-race-with-terminate_all.patch
 mips-ath79-fix-system-restart.patch
 media-videobuf2-core-check-for-q-error-in-vb2_core_qbuf.patch
 mtd-maps-fix-solutionengine.c-printk-format-warnings.patch
-gfs2-don-t-reject-a-supposedly-full-bitmap-if-we-have-blocks-reserved.patch
 fbdev-omapfb-off-by-one-in-omapfb_register_client.patch
 video-goldfishfb-fix-memory-leak-on-driver-remove.patch
 fbdev-via-fix-defined-but-not-used-warning.patch