5.4-stable patches

added patches:
	ata-pata_ftide010-add-missing-module_description.patch
	ata-sata_gemini-add-missing-module_description.patch
	fuse-nlookup-missing-decrement-in-fuse_direntplus_link.patch

diff --git a/queue-5.4/ata-pata_ftide010-add-missing-module_description.patch b/queue-5.4/ata-pata_ftide010-add-missing-module_description.patch
new file mode 100644 (file)
index 0000000..edf013e
--- /dev/null
+++ b/queue-5.4/ata-pata_ftide010-add-missing-module_description.patch
@@ -0,0 +1,34 @@
+From 7274eef5729037300f29d14edeb334a47a098f65 Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <dlemoal@kernel.org>
+Date: Thu, 24 Aug 2023 07:41:59 +0900
+Subject: ata: pata_ftide010: Add missing MODULE_DESCRIPTION
+
+From: Damien Le Moal <dlemoal@kernel.org>
+
+commit 7274eef5729037300f29d14edeb334a47a098f65 upstream.
+
+Add the missing MODULE_DESCRIPTION() to avoid warnings such as:
+
+WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/ata/pata_ftide010.o
+
+when compiling with W=1.
+
+Fixes: be4e456ed3a5 ("ata: Add driver for Faraday Technology FTIDE010")
+Cc: stable@vger.kernel.org
+Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/ata/pata_ftide010.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/ata/pata_ftide010.c
++++ b/drivers/ata/pata_ftide010.c
+@@ -570,6 +570,7 @@ static struct platform_driver pata_ftide
+ };
+ module_platform_driver(pata_ftide010_driver);
+ 
++MODULE_DESCRIPTION("low level driver for Faraday Technology FTIDE010");
+ MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("platform:" DRV_NAME);

diff --git a/queue-5.4/ata-sata_gemini-add-missing-module_description.patch b/queue-5.4/ata-sata_gemini-add-missing-module_description.patch
new file mode 100644 (file)
index 0000000..907f9a5
--- /dev/null
+++ b/queue-5.4/ata-sata_gemini-add-missing-module_description.patch
@@ -0,0 +1,34 @@
+From 8566572bf3b4d6e416a4bf2110dbb4817d11ba59 Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <dlemoal@kernel.org>
+Date: Thu, 24 Aug 2023 07:43:18 +0900
+Subject: ata: sata_gemini: Add missing MODULE_DESCRIPTION
+
+From: Damien Le Moal <dlemoal@kernel.org>
+
+commit 8566572bf3b4d6e416a4bf2110dbb4817d11ba59 upstream.
+
+Add the missing MODULE_DESCRIPTION() to avoid warnings such as:
+
+WARNING: modpost: missing MODULE_DESCRIPTION() in drivers/ata/sata_gemini.o
+
+when compiling with W=1.
+
+Fixes: be4e456ed3a5 ("ata: Add driver for Faraday Technology FTIDE010")
+Cc: stable@vger.kernel.org
+Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/ata/sata_gemini.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/ata/sata_gemini.c
++++ b/drivers/ata/sata_gemini.c
+@@ -435,6 +435,7 @@ static struct platform_driver gemini_sat
+ };
+ module_platform_driver(gemini_sata_driver);
+ 
++MODULE_DESCRIPTION("low level driver for Cortina Systems Gemini SATA bridge");
+ MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("platform:" DRV_NAME);

diff --git a/queue-5.4/fuse-nlookup-missing-decrement-in-fuse_direntplus_link.patch b/queue-5.4/fuse-nlookup-missing-decrement-in-fuse_direntplus_link.patch
new file mode 100644 (file)
index 0000000..c130bde
--- /dev/null
+++ b/queue-5.4/fuse-nlookup-missing-decrement-in-fuse_direntplus_link.patch
@@ -0,0 +1,47 @@
+From b8bd342d50cbf606666488488f9fea374aceb2d5 Mon Sep 17 00:00:00 2001
+From: ruanmeisi <ruan.meisi@zte.com.cn>
+Date: Tue, 25 Apr 2023 19:13:54 +0800
+Subject: fuse: nlookup missing decrement in fuse_direntplus_link
+
+From: ruanmeisi <ruan.meisi@zte.com.cn>
+
+commit b8bd342d50cbf606666488488f9fea374aceb2d5 upstream.
+
+During our debugging of glusterfs, we found an Assertion failed error:
+inode_lookup >= nlookup, which was caused by the nlookup value in the
+kernel being greater than that in the FUSE file system.
+
+The issue was introduced by fuse_direntplus_link, where in the function,
+fuse_iget increments nlookup, and if d_splice_alias returns failure,
+fuse_direntplus_link returns failure without decrementing nlookup
+https://github.com/gluster/glusterfs/pull/4081
+
+Signed-off-by: ruanmeisi <ruan.meisi@zte.com.cn>
+Fixes: 0b05b18381ee ("fuse: implement NFS-like readdirplus support")
+Cc: <stable@vger.kernel.org> # v3.9
+Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/fuse/readdir.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/fs/fuse/readdir.c
++++ b/fs/fuse/readdir.c
+@@ -238,8 +238,16 @@ retry:
+                       dput(dentry);
+                       dentry = alias;
+               }
+-              if (IS_ERR(dentry))
++              if (IS_ERR(dentry)) {
++                      if (!IS_ERR(inode)) {
++                              struct fuse_inode *fi = get_fuse_inode(inode);
++
++                              spin_lock(&fi->lock);
++                              fi->nlookup--;
++                              spin_unlock(&fi->lock);
++                      }
+                       return PTR_ERR(dentry);
++              }
+       }
+       if (fc->readdirplus_auto)
+               set_bit(FUSE_I_INIT_RDPLUS, &get_fuse_inode(inode)->state);

diff --git a/queue-5.4/series b/queue-5.4/series
index 138b0849d9fb29edc4acdb2a1f2538d327431d49..d5eda1292e16f9d841df5f5039193788a5e1f2f2 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -277,3 +277,6 @@ ip_tunnels-use-dev_stats_inc.patch
 netfilter-nfnetlink_osf-avoid-oob-read.patch
 net-hns3-fix-the-port-information-display-when-sfp-i.patch
 sh-boards-fix-ceu-buffer-size-passed-to-dma_declare_.patch
+ata-sata_gemini-add-missing-module_description.patch
+ata-pata_ftide010-add-missing-module_description.patch
+fuse-nlookup-missing-decrement-in-fuse_direntplus_link.patch