diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-01-28 05:46:07 +0100 |
|---|---|---|
| committer | Anna Schumaker <anna.schumaker@oracle.com> | 2026-01-30 16:49:15 -0500 |
| commit | f7550318b29f754dabfb2f1db535ffe77e6d4446 (patch) | |
| tree | 5724a8c6c15237f56f60e58dd50e64b6aaf7c497 | |
| parent | 438c3e47c2e5edfde3ab01443345b4c5e5f2fb55 (diff) | |
| download | linux-f7550318b29f754dabfb2f1db535ffe77e6d4446.tar.gz linux-f7550318b29f754dabfb2f1db535ffe77e6d4446.zip | |
NFS: fold nfs_abort_delegation_return into nfs_end_delegation_return
This will allow to simplify the error handling flow.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
| -rw-r--r-- | fs/nfs/delegation.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 32803963b5d7..cf90aa7f922a 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -350,21 +350,6 @@ nfs_start_delegation_return(struct nfs_inode *nfsi) return delegation; } -static void nfs_abort_delegation_return(struct nfs_delegation *delegation, - struct nfs_server *server, int err) -{ - spin_lock(&delegation->lock); - clear_bit(NFS_DELEGATION_RETURNING, &delegation->flags); - if (err == -EAGAIN) { - set_bit(NFS_DELEGATION_RETURN_DELAYED, &delegation->flags); - set_bit(NFS4SERV_DELEGRETURN_DELAYED, - &server->delegation_flags); - set_bit(NFS4CLNT_DELEGRETURN_DELAYED, - &server->nfs_client->cl_state); - } - spin_unlock(&delegation->lock); -} - static bool nfs_detach_delegations_locked(struct nfs_inode *nfsi, struct nfs_delegation *delegation, @@ -593,13 +578,23 @@ static int nfs_end_delegation_return(struct inode *inode, err = nfs4_wait_clnt_recover(server->nfs_client); } - if (err) { - nfs_abort_delegation_return(delegation, server, err); - return err; - } + if (err) + goto abort; out_return: return nfs_do_return_delegation(inode, delegation, issync); +abort: + spin_lock(&delegation->lock); + clear_bit(NFS_DELEGATION_RETURNING, &delegation->flags); + if (err == -EAGAIN) { + set_bit(NFS_DELEGATION_RETURN_DELAYED, &delegation->flags); + set_bit(NFS4SERV_DELEGRETURN_DELAYED, + &server->delegation_flags); + set_bit(NFS4CLNT_DELEGRETURN_DELAYED, + &server->nfs_client->cl_state); + } + spin_unlock(&delegation->lock); + return err; } static int nfs_return_one_delegation(struct nfs_server *server) |