From 84606049e7e0c925df75a7bf8e0901e677ddea46 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 21 Sep 2022 21:17:55 +0200 Subject: [PATCH] linux-5.15.69: Rebuild with nfs patch Use mariux-5.15.69-436 which added upstream commit 6e176d47160c ("NFSv4: Fixes for nfs4_inode_return_delegation()"): Author: Trond Myklebust Date: Sun Oct 10 10:58:12 2021 +0200 NFSv4: Fixes for nfs4_inode_return_delegation() We mustn't call nfs_wb_all() on anything other than a regular file. Furthermore, we can exit early when we don't hold a delegation. Reported-by: David Wysochanski Signed-off-by: Trond Myklebust diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 11118398f495..7c9eb679dbdb 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -755,11 +755,13 @@ int nfs4_inode_return_delegation(struct inode *inode) struct nfs_delegation *delegation; delegation = nfs_start_delegation_return(nfsi); - /* Synchronous recall of any application leases */ - break_lease(inode, O_WRONLY | O_RDWR); - nfs_wb_all(inode); - if (delegation != NULL) + if (delegation != NULL) { + /* Synchronous recall of any application leases */ + break_lease(inode, O_WRONLY | O_RDWR); + if (S_ISREG(inode->i_mode)) + nfs_wb_all(inode); return nfs_end_delegation_return(inode, delegation, 1); + } return 0; } --- linux-5.15.69-435.bee => linux-5.15.69-436.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename linux-5.15.69-435.bee => linux-5.15.69-436.bee (92%) diff --git a/linux-5.15.69-435.bee b/linux-5.15.69-436.bee similarity index 92% rename from linux-5.15.69-435.bee rename to linux-5.15.69-436.bee index 4f598981b..8f3073683 100755 --- a/linux-5.15.69-435.bee +++ b/linux-5.15.69-436.bee @@ -10,7 +10,7 @@ KERNELVERSION=${KERNELVERSION}${PKGEXTRAVERSION_DASH} echo $KERNELVERSION #SRCURL[0]="https://github.molgen.mpg.de/mariux64/linux/archive/refs/tags/mariux-$KERNELVERSION-$PKGREVISION.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/f278caa4e8e9dbd758a7c5ba1914d8a4/mariux-5.15.69-435.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/27c71d95b8be538622dd4bbbba0986af/mariux-5.15.69-436.tar.gz" KERNELLOCAL=".mx64.${PKGREVISION}" FULLKERNELVERSION="${KERNELVERSION}${KERNELLOCAL}"