July 2023 - Linux-stable-mirror

FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 4.14-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072159-contour-busily-038e@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") 3fd269e74f2f ("amba: Make the remove callback return void") 5b495ac8fe03 ("vfio: platform: simplify device removal") de5d7adb8936 ("amba: Fix resource leak for drivers without .remove") 45fe7befe0db ("coresight: remove broken __exit annotations") 726eb70e0d34 ("Merge tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: <stable(a)vger.kernel.org> # v3.6+ Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Wolfram Sang <wsa(a)kernel.org> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {

1 year, 9 months

1
0
0 0

FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072158-eats-willed-e08f@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") 3fd269e74f2f ("amba: Make the remove callback return void") 5b495ac8fe03 ("vfio: platform: simplify device removal") de5d7adb8936 ("amba: Fix resource leak for drivers without .remove") 45fe7befe0db ("coresight: remove broken __exit annotations") 726eb70e0d34 ("Merge tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: <stable(a)vger.kernel.org> # v3.6+ Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Wolfram Sang <wsa(a)kernel.org> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {

1 year, 9 months

1
0
0 0

FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072157-worrier-subsector-3ee9@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") 3fd269e74f2f ("amba: Make the remove callback return void") 5b495ac8fe03 ("vfio: platform: simplify device removal") de5d7adb8936 ("amba: Fix resource leak for drivers without .remove") 45fe7befe0db ("coresight: remove broken __exit annotations") 726eb70e0d34 ("Merge tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: <stable(a)vger.kernel.org> # v3.6+ Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Wolfram Sang <wsa(a)kernel.org> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {

1 year, 9 months

1
0
0 0

FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 5.10-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072156-surrender-undergrad-b32e@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") 3fd269e74f2f ("amba: Make the remove callback return void") 5b495ac8fe03 ("vfio: platform: simplify device removal") de5d7adb8936 ("amba: Fix resource leak for drivers without .remove") 45fe7befe0db ("coresight: remove broken __exit annotations") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: <stable(a)vger.kernel.org> # v3.6+ Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Wolfram Sang <wsa(a)kernel.org> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {

1 year, 9 months

1
0
0 0

FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072154-strongman-envision-caa9@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: <stable(a)vger.kernel.org> # v3.6+ Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Wolfram Sang <wsa(a)kernel.org> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {

1 year, 9 months

1
0
0 0

FAILED: patch "[PATCH] i2c: nomadik: Remove a useless call in the remove function" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 05f933d5f7318b03ff2028c1704dc867ac16f2c7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072155-cosmetics-snazzy-720f@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 05f933d5f731 ("i2c: nomadik: Remove a useless call in the remove function") 9c7174db4cdd ("i2c: nomadik: Use devm_clk_get_enabled()") 1c5d33fff0d3 ("i2c: nomadik: Remove unnecessary goto label") 06e989578232 ("i2c: Improve size determinations") 6b3b21a8542f ("i2c: Delete error messages for failed memory allocations") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 05f933d5f7318b03ff2028c1704dc867ac16f2c7 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Date: Tue, 4 Jul 2023 21:50:28 +0200 Subject: [PATCH] i2c: nomadik: Remove a useless call in the remove function Since commit 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. Fixes: 235602146ec9 ("i2c-nomadik: turn the platform driver to an amba driver") Cc: <stable(a)vger.kernel.org> # v3.6+ Acked-by: Linus Walleij <linus.walleij(a)linaro.org> Reviewed-by: Andi Shyti <andi.shyti(a)kernel.org> Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Wolfram Sang <wsa(a)kernel.org> diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {

1 year, 9 months

1
0
0 0

Interrupt storm on some gaming laptops

by Limonciello, Mario

Hi, An interrupt storm was reported on some gaming laptops [1]. This is fixed by a series of commits that has gone into 6.5-rc2. This interrupt storm causes a pretty dramatic issue of unable to use the internal keyboard, so IMO a good idea to take the solution back to stable kernels as well. Here is the series needed for 6.4.y: 968ab9261627 pinctrl: amd: Detect internal GPIO0 debounce handling a855724dc08b pinctrl: amd: Fix mistake in handling clearing pins at startup 0cf9e48ff22e pinctrl: amd: Detect and mask spurious interrupts 65f6c7c91cb2 pinctrl: amd: Revert "pinctrl: amd: disable and mask interrupts on probe" 0d5ace1a07f7 pinctrl: amd: Only use special debounce behavior for GPIO 0 635a750d958e pinctrl: amd: Use amd_pinconf_set() for all config options 3f62312d04d4 pinctrl: amd: Drop pull up select configuration 283c5ce7da0a pinctrl: amd: Unify debounce handling into amd_pinconf_set() Here is the series needed for 6.1.y: df72b4a692b6 pinctrl: amd: Add Z-state wake control bits 75358cf3319d pinctrl: amd: Adjust debugfs output 010f493d90ee pinctrl: amd: Add fields for interrupt status and wake status 968ab9261627 pinctrl: amd: Detect internal GPIO0 debounce handling a855724dc08b pinctrl: amd: Fix mistake in handling clearing pins at startup 0cf9e48ff22e pinctrl: amd: Detect and mask spurious interrupts 65f6c7c91cb2 pinctrl: amd: Revert "pinctrl: amd: disable and mask interrupts on probe" 0d5ace1a07f7 pinctrl: amd: Only use special debounce behavior for GPIO 0 635a750d958e pinctrl: amd: Use amd_pinconf_set() for all config options 3f62312d04d4 pinctrl: amd: Drop pull up select configuration 283c5ce7da0a pinctrl: amd: Unify debounce handling into amd_pinconf_set() [1] https://bugzilla.kernel.org/show_bug.cgi?id=217336 Thanks,

1 year, 9 months

2
1
0 0

[PATCH] ceph: defer stopping the mdsc delayed_work

by xiubli＠redhat.com

From: Xiubo Li <xiubli(a)redhat.com> Flushing the dirty buffer may take a long time if the Rados is overloaded or if there is network issue. So we should ping the MDSs perioudically to keep alive, else the MDS will blocklist the kclient. Cc: stable(a)vger.kernel.org Cc: Venky Shankar <vshankar(a)redhat.com> URL: https://tracker.ceph.com/issues/61843 Signed-off-by: Xiubo Li <xiubli(a)redhat.com> --- fs/ceph/mds_client.c | 2 +- fs/ceph/mds_client.h | 3 ++- fs/ceph/super.c | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 65230ebefd51..70987b3c198a 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -5192,7 +5192,7 @@ static void delayed_work(struct work_struct *work) doutc(mdsc->fsc->client, "mdsc delayed_work\n"); - if (mdsc->stopping) + if (mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHED) return; mutex_lock(&mdsc->mutex); diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 5d02c8c582fd..befbd384428e 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -400,7 +400,8 @@ struct cap_wait { enum { CEPH_MDSC_STOPPING_BEGIN = 1, - CEPH_MDSC_STOPPING_FLUSHED = 2, + CEPH_MDSC_STOPPING_FLUSHING = 2, + CEPH_MDSC_STOPPING_FLUSHED = 3, }; /* diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 8e1e517a45db..fb694ba72955 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -1488,7 +1488,7 @@ static int ceph_init_fs_context(struct fs_context *fc) static bool __inc_stopping_blocker(struct ceph_mds_client *mdsc) { spin_lock(&mdsc->stopping_lock); - if (mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHED) { + if (mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHING) { spin_unlock(&mdsc->stopping_lock); return false; } @@ -1501,7 +1501,7 @@ static void __dec_stopping_blocker(struct ceph_mds_client *mdsc) { spin_lock(&mdsc->stopping_lock); if (!atomic_dec_return(&mdsc->stopping_blockers) && - mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHED) + mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHING) complete_all(&mdsc->stopping_waiter); spin_unlock(&mdsc->stopping_lock); } @@ -1562,7 +1562,7 @@ static void ceph_kill_sb(struct super_block *s) sync_filesystem(s); spin_lock(&mdsc->stopping_lock); - mdsc->stopping = CEPH_MDSC_STOPPING_FLUSHED; + mdsc->stopping = CEPH_MDSC_STOPPING_FLUSHING; wait = !!atomic_read(&mdsc->stopping_blockers); spin_unlock(&mdsc->stopping_lock); @@ -1576,6 +1576,7 @@ static void ceph_kill_sb(struct super_block *s) pr_warn_client(cl, "umount was killed, %ld\n", timeleft); } + mdsc->stopping = CEPH_MDSC_STOPPING_FLUSHED; kill_anon_super(s); fsc->client->extra_mon_dispatch = NULL; -- 2.40.1

1 year, 9 months

3
2
0 0

linux-stable regression: please backport 8ae071fc216a

by Masahiro Yamada

Hi Greg, Sasha, Please backport 8ae071fc216a ("kbuild: make modules_install copy modules.builtin(.modinfo)") with this tag: Stable-dep-of: 4243afdb9326 ("kbuild: builddeb: always make modules_install, to install modules.builtin*") Recently, we back-ported 4243afdb9326, which depends on 8ae071fc216a Without the proper dependency, there was a regression report for Debian package builds with CONFIG_MODULES=n. https://bugzilla.kernel.org/show_bug.cgi?id=217689#regzbot -- Best Regards Masahiro Yamada

1 year, 9 months

2
1
0 0

[PATCH stable 5.4.y] erofs: fix compact 4B support for 16k block size

by Gao Xiang

commit 001b8ccd0650727e54ec16ef72bf1b8eeab7168e upstream. In compact 4B, two adjacent lclusters are packed together as a unit to form on-disk indexes for effective random access, as below: (amortized = 4, vcnt = 2) _____________________________________________ |___@_____ encoded bits __________|_ blkaddr _| 0 . amortized * vcnt = 8 . . . . amortized * vcnt - 4 = 4 . . .____________________________. |_type (2 bits)_|_clusterofs_| Therefore, encoded bits for each pack are 32 bits (4 bytes). IOWs, since each lcluster can get 16 bits for its type and clusterofs, the maximum supported lclustersize for compact 4B format is 16k (14 bits). Fix this to enable compact 4B format for 16k lclusters (blocks), which is tested on an arm64 server with 16k page size. Fixes: 152a333a5895 ("staging: erofs: add compacted compression indexes support") Link: https://lore.kernel.org/r/20230601112341.56960-1-hsiangkao@linux.alibaba.com Signed-off-by: Gao Xiang <hsiangkao(a)linux.alibaba.com> --- resolve a trivial conflict. fs/erofs/zmap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index b5ee58fdd82f..6553f58fb289 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -215,7 +215,7 @@ static int unpack_compacted_index(struct z_erofs_maprecorder *m, int i; u8 *in, type; - if (1 << amortizedshift == 4) + if (1 << amortizedshift == 4 && lclusterbits <= 14) vcnt = 2; else if (1 << amortizedshift == 2 && lclusterbits == 12) vcnt = 16; @@ -273,7 +273,6 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, { struct inode *const inode = m->inode; struct erofs_inode *const vi = EROFS_I(inode); - const unsigned int lclusterbits = vi->z_logical_clusterbits; const erofs_off_t ebase = ALIGN(iloc(EROFS_I_SB(inode), vi->nid) + vi->inode_isize + vi->xattr_isize, 8) + sizeof(struct z_erofs_map_header); @@ -283,9 +282,6 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, erofs_off_t pos; int err; - if (lclusterbits != 12) - return -EOPNOTSUPP; - if (lcn >= totalidx) return -EINVAL; -- 2.24.4

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2023