1 files changed, 47 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0087-NFS-Fix-WARN_ON-due-to-unionization-of-nfs_inode.nre.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0087-NFS-Fix-WARN_ON-due-to-unionization-of-nfs_inode.nre.patch
new file mode 100644
index 00000000..5215452c
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-5.15/0087-NFS-Fix-WARN_ON-due-to-unionization-of-nfs_inode.nre.patch
@@ -0,0 +1,47 @@
+From bfc4d7690f61a068e08e91ac0617ce7a5061d143 Mon Sep 17 00:00:00 2001
+From: Dave Wysochanski <dwysocha@redhat.com>
+Date: Sun, 10 Oct 2021 18:23:13 -0400
+Subject: [PATCH 87/87] NFS: Fix WARN_ON due to unionization of
+ nfs_inode.nrequests
+
+commit 0ebeebcf59601bcfa0284f4bb7abdec051eb856d upstream.
+
+Fixes the following WARN_ON
+WARNING: CPU: 2 PID: 18678 at fs/nfs/inode.c:123 nfs_clear_inode+0x3b/0x50 [nfs]
+...
+Call Trace:
+  nfs4_evict_inode+0x57/0x70 [nfsv4]
+  evict+0xd1/0x180
+  dispose_list+0x48/0x60
+  evict_inodes+0x156/0x190
+  generic_shutdown_super+0x37/0x110
+  nfs_kill_super+0x1d/0x40 [nfs]
+  deactivate_locked_super+0x36/0xa0
+
+Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+[SY: port a68a734b19afc8683238a176c8e088c0f9e6c7b9 from 5.15]
+Integrated-by: Siyu Zhang <siyu.zhang@windriver.com>
+---
+ include/linux/nfs_fs.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
+index 71467d661fb6..5ddc30405f7f 100644
+--- a/include/linux/nfs_fs.h
++++ b/include/linux/nfs_fs.h
+@@ -593,7 +593,9 @@ bool nfs_commit_end(struct nfs_mds_commit_info *cinfo);
+ static inline int
+ nfs_have_writebacks(struct inode *inode)
+ {
+-	return atomic_long_read(&NFS_I(inode)->nrequests) != 0;
++	if (S_ISREG(inode->i_mode))
++		return atomic_long_read(&NFS_I(inode)->nrequests) != 0;
++	return 0;
+ }
+ 
+ /*
+-- 
+2.25.1
+