From: Christoph Hellwig <hch@lst.de>
Date: Wed, 28 Jan 2026 04:46:06 +0000 (+0100)
Subject: NFS: remove the delegation == NULL check in nfs_end_delegation_return
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=438c3e47c2e5edfde3ab01443345b4c5e5f2fb55;p=thirdparty%2Fkernel%2Flinux.git

NFS: remove the delegation == NULL check in nfs_end_delegation_return

All callers now pass a non-NULL delegation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
---

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index d95a6e9876f15..32803963b5d7b 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -571,9 +571,6 @@ static int nfs_end_delegation_return(struct inode *inode,
 	unsigned int mode = O_WRONLY | O_RDWR;
 	int err = 0;
 
-	if (delegation == NULL)
-		return 0;
-
 	/* Directory delegations don't require any state recovery */
 	if (!S_ISREG(inode->i_mode))
 		goto out_return;