Merge: NFS: remove revoked delegation from server's delegation list

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7510

JIRA: https://issues.redhat.com/browse/RHEL-123617

The upstream work to resolve NFS client delegation cleanup in
https://issues.redhat.com/browse/RHEL-70625

.. is missing an upstream dependency:
7ef6010 NFS: remove revoked delegation from server's delegation list

We must take it here and also backport to affected RHEL-9 Z-streams.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>

Approved-by: Jay Shin <jaeshin@redhat.com>
Approved-by: Scott Mayhew <smayhew@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>

Author: CKI KWF Bot

fs/nfs/delegation.c

@@ -1045,6 +1045,11 @@ void nfs_delegation_mark_returned(struct inode *inode,
 	}
 
 	nfs_mark_delegation_revoked(delegation);
+	clear_bit(NFS_DELEGATION_RETURNING, &delegation->flags);
+	spin_unlock(&delegation->lock);
+	if (nfs_detach_delegation(NFS_I(inode), delegation, NFS_SERVER(inode)))
+		nfs_put_delegation(delegation);
+	goto out_rcu_unlock;
 
 out_clear_returning:
 	clear_bit(NFS_DELEGATION_RETURNING, &delegation->flags);