From: Sasha Levin Date: Tue, 2 Jun 2020 02:19:19 +0000 (-0400) Subject: Drop gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch X-Git-Tag: v4.4.226~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62fae23170fb57d6674c21e3a95d0c0c68dae704;p=thirdparty%2Fkernel%2Fstable-queue.git Drop gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch b/queue-4.14/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch deleted file mode 100644 index d7cc2538a61..00000000000 --- a/queue-4.14/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4f58b38db0717747cfedde54215fd2cc6aed4af4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 11:55:03 -0500 -Subject: gfs2: don't call quota_unhold if quotas are not locked - -From: Bob Peterson - -[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ] - -Before this patch, function gfs2_quota_unlock checked if quotas are -turned off, and if so, it branched to label out, which called -gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we -no longer want to call gfs2_quota_unhold or we won't balance our -gets and puts. - -Signed-off-by: Bob Peterson -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin ---- - fs/gfs2/quota.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index a833e2e07167..d34a668a432f 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1112,7 +1112,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - int found; - - if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) -- goto out; -+ return; - - for (x = 0; x < ip->i_qadata->qa_qd_num; x++) { - struct gfs2_quota_data *qd; -@@ -1149,7 +1149,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - qd_unlock(qda[x]); - } - --out: - gfs2_quota_unhold(ip); - } - --- -2.25.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 9c2c8abc4ff..84dc75e0d55 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -15,7 +15,6 @@ arm-dts-rockchip-fix-pinctrl-sub-nodename-for-spi-in.patch gpio-tegra-mask-gpio-irqs-during-irq-shutdown.patch net-microchip-encx24j600-add-missed-kthread_stop.patch gfs2-move-privileged-user-check-to-gfs2_quota_lock_c.patch -gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch cachefiles-fix-race-between-read_waiter-and-read_cop.patch usb-gadget-legacy-fix-redundant-initialization-warni.patch net-freescale-select-config_fixed_phy-where-needed.patch diff --git a/queue-4.19/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch b/queue-4.19/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch deleted file mode 100644 index 969434295e6..00000000000 --- a/queue-4.19/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From db5d96345cfac06d6e24d91b9dc8ca3a1129564e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 11:55:03 -0500 -Subject: gfs2: don't call quota_unhold if quotas are not locked - -From: Bob Peterson - -[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ] - -Before this patch, function gfs2_quota_unlock checked if quotas are -turned off, and if so, it branched to label out, which called -gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we -no longer want to call gfs2_quota_unhold or we won't balance our -gets and puts. - -Signed-off-by: Bob Peterson -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin ---- - fs/gfs2/quota.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index dd0f9bc13164..ce47c8233612 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1116,7 +1116,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - int found; - - if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) -- goto out; -+ return; - - for (x = 0; x < ip->i_qadata->qa_qd_num; x++) { - struct gfs2_quota_data *qd; -@@ -1153,7 +1153,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - qd_unlock(qda[x]); - } - --out: - gfs2_quota_unhold(ip); - } - --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 2d02174e688..38987f9f358 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -25,7 +25,6 @@ gpio-tegra-mask-gpio-irqs-during-irq-shutdown.patch alsa-usb-audio-add-mapping-for-asrock-trx40-creator.patch net-microchip-encx24j600-add-missed-kthread_stop.patch gfs2-move-privileged-user-check-to-gfs2_quota_lock_c.patch -gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch cachefiles-fix-race-between-read_waiter-and-read_cop.patch usb-dwc3-pci-enable-extcon-driver-for-intel-merrifie.patch usb-gadget-legacy-fix-redundant-initialization-warni.patch diff --git a/queue-4.4/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch b/queue-4.4/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch deleted file mode 100644 index d092dfa63a2..00000000000 --- a/queue-4.4/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fedc1bb981a00fb58d2ba949c690b23bd8dac8ca Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 11:55:03 -0500 -Subject: gfs2: don't call quota_unhold if quotas are not locked - -From: Bob Peterson - -[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ] - -Before this patch, function gfs2_quota_unlock checked if quotas are -turned off, and if so, it branched to label out, which called -gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we -no longer want to call gfs2_quota_unhold or we won't balance our -gets and puts. - -Signed-off-by: Bob Peterson -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin ---- - fs/gfs2/quota.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index 3a31226531ea..4af00ed4960a 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1080,7 +1080,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - int found; - - if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) -- goto out; -+ return; - - for (x = 0; x < ip->i_res->rs_qa_qd_num; x++) { - struct gfs2_quota_data *qd; -@@ -1117,7 +1117,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - qd_unlock(qda[x]); - } - --out: - gfs2_quota_unhold(ip); - } - --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 957fc44804c..4478c8e3bea 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -6,7 +6,6 @@ net-sun-fix-missing-release-regions-in-cas_init_one.patch net-mlx4_core-fix-a-memory-leak-bug.patch uapi-fix-linux-if_pppol2tp.h-userspace-compilation-errors.patch ib-cma-fix-reference-count-leak-when-no-ipv4-addresses-are-set.patch -gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch cachefiles-fix-race-between-read_waiter-and-read_cop.patch usb-gadget-legacy-fix-redundant-initialization-warni.patch cifs-fix-null-pointer-check-in-cifs_read.patch diff --git a/queue-4.9/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch b/queue-4.9/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch deleted file mode 100644 index af8611f7acc..00000000000 --- a/queue-4.9/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7407c72f786d0111927ca58d08a516cf30453483 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 11:55:03 -0500 -Subject: gfs2: don't call quota_unhold if quotas are not locked - -From: Bob Peterson - -[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ] - -Before this patch, function gfs2_quota_unlock checked if quotas are -turned off, and if so, it branched to label out, which called -gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we -no longer want to call gfs2_quota_unhold or we won't balance our -gets and puts. - -Signed-off-by: Bob Peterson -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin ---- - fs/gfs2/quota.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index fb9b1d702351..fb2e0ad945bf 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1112,7 +1112,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - int found; - - if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) -- goto out; -+ return; - - for (x = 0; x < ip->i_qadata->qa_qd_num; x++) { - struct gfs2_quota_data *qd; -@@ -1149,7 +1149,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - qd_unlock(qda[x]); - } - --out: - gfs2_quota_unhold(ip); - } - --- -2.25.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 14efe01a514..50d012ede4a 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -13,7 +13,6 @@ ib-cma-fix-reference-count-leak-when-no-ipv4-addresses-are-set.patch gpio-tegra-mask-gpio-irqs-during-irq-shutdown.patch net-microchip-encx24j600-add-missed-kthread_stop.patch gfs2-move-privileged-user-check-to-gfs2_quota_lock_c.patch -gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch cachefiles-fix-race-between-read_waiter-and-read_cop.patch usb-gadget-legacy-fix-redundant-initialization-warni.patch cifs-fix-null-pointer-check-in-cifs_read.patch diff --git a/queue-5.4/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch b/queue-5.4/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch deleted file mode 100644 index 3236898422c..00000000000 --- a/queue-5.4/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9770d5c15d378a2c3e70bf014eb6e39c23fe9106 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 11:55:03 -0500 -Subject: gfs2: don't call quota_unhold if quotas are not locked - -From: Bob Peterson - -[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ] - -Before this patch, function gfs2_quota_unlock checked if quotas are -turned off, and if so, it branched to label out, which called -gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we -no longer want to call gfs2_quota_unhold or we won't balance our -gets and puts. - -Signed-off-by: Bob Peterson -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin ---- - fs/gfs2/quota.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index cbee745169b8..91ca4920bf03 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1113,7 +1113,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - int found; - - if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) -- goto out; -+ return; - - for (x = 0; x < ip->i_qadata->qa_qd_num; x++) { - struct gfs2_quota_data *qd; -@@ -1150,7 +1150,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - qd_unlock(qda[x]); - } - --out: - gfs2_quota_unhold(ip); - } - --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index a8df7a51e53..3ba16a5dd2b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -39,7 +39,6 @@ gpio-tegra-mask-gpio-irqs-during-irq-shutdown.patch alsa-usb-audio-add-mapping-for-asrock-trx40-creator.patch net-microchip-encx24j600-add-missed-kthread_stop.patch gfs2-move-privileged-user-check-to-gfs2_quota_lock_c.patch -gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch gfs2-grab-glock-reference-sooner-in-gfs2_add_revoke.patch drm-amdgpu-drop-unnecessary-cancel_delayed_work_sync.patch drm-amd-powerplay-perform-pg-ungate-prior-to-cg-unga.patch diff --git a/queue-5.6/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch b/queue-5.6/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch deleted file mode 100644 index 82298155d9b..00000000000 --- a/queue-5.6/gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 519355aaf1d00f657783d2940196622889d4cacb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 May 2020 11:55:03 -0500 -Subject: gfs2: don't call quota_unhold if quotas are not locked - -From: Bob Peterson - -[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ] - -Before this patch, function gfs2_quota_unlock checked if quotas are -turned off, and if so, it branched to label out, which called -gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we -no longer want to call gfs2_quota_unhold or we won't balance our -gets and puts. - -Signed-off-by: Bob Peterson -Signed-off-by: Andreas Gruenbacher -Signed-off-by: Sasha Levin ---- - fs/gfs2/quota.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c -index 832d44782f74..a80b638b582e 100644 ---- a/fs/gfs2/quota.c -+++ b/fs/gfs2/quota.c -@@ -1113,7 +1113,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - int found; - - if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) -- goto out; -+ return; - - for (x = 0; x < ip->i_qadata->qa_qd_num; x++) { - struct gfs2_quota_data *qd; -@@ -1150,7 +1150,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) - qd_unlock(qda[x]); - } - --out: - gfs2_quota_unhold(ip); - } - --- -2.25.1 - diff --git a/queue-5.6/series b/queue-5.6/series index 5b9ed80f656..7e1ed051eb8 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -55,7 +55,6 @@ arm-dts-omap4-droid4-fix-occasional-lost-wakeirq-for.patch net-microchip-encx24j600-add-missed-kthread_stop.patch kselftests-dmabuf-heaps-fix-confused-return-value-on.patch gfs2-move-privileged-user-check-to-gfs2_quota_lock_c.patch -gfs2-don-t-call-quota_unhold-if-quotas-are-not-locke.patch gfs2-grab-glock-reference-sooner-in-gfs2_add_revoke.patch drm-amdgpu-drop-unnecessary-cancel_delayed_work_sync.patch drm-amd-powerplay-perform-pg-ungate-prior-to-cg-unga.patch