Skip to content

Commit

Permalink
linux-5.15.69: Rebuild with nfs patch
Browse files Browse the repository at this point in the history
Use mariux-5.15.69-436 which added upstream commit 6e176d47160c ("NFSv4:
Fixes for nfs4_inode_return_delegation()"):

Author: Trond Myklebust <trond.myklebust@hammerspace.com>
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 <dwysocha@redhat.com>
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

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;
 }
  • Loading branch information
donald committed Sep 21, 2022
1 parent 2a78a19 commit 8460604
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion linux-5.15.69-435.bee → linux-5.15.69-436.bee
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 8460604

Please sign in to comment.