diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-01-07 10:26:57 +0300 |
|---|---|---|
| committer | Anna Schumaker <anna.schumaker@oracle.com> | 2026-01-20 22:49:46 +0300 |
| commit | 635879a427b855db477e293514f74ffbfa920794 (patch) | |
| tree | 905799fe3a0289377cc2481773b215216e75d6b5 | |
| parent | ee443e116151fbcf08e2296b21f28f942b18c2ed (diff) | |
| download | linux-635879a427b855db477e293514f74ffbfa920794.tar.xz | |
NFS: remove nfs_start_delegation_return
There is only one caller, so fold it into that. With that,
nfs_start_delegation_return
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
| -rw-r--r-- | fs/nfs/delegation.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 86b8da1e2598..1f899edd427f 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -336,17 +336,6 @@ out: return ret; } -static struct nfs_delegation * -nfs_start_delegation_return(struct nfs_inode *nfsi) -{ - struct nfs_delegation *delegation; - - rcu_read_lock(); - delegation = nfs_start_delegation_return_locked(nfsi); - rcu_read_unlock(); - return delegation; -} - static void nfs_abort_delegation_return(struct nfs_delegation *delegation, struct nfs_server *server, int err) { @@ -793,15 +782,18 @@ int nfs4_inode_return_delegation(struct inode *inode) struct nfs_inode *nfsi = NFS_I(inode); struct nfs_delegation *delegation; - delegation = nfs_start_delegation_return(nfsi); - 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; + rcu_read_lock(); + delegation = nfs_start_delegation_return_locked(nfsi); + rcu_read_unlock(); + + if (!delegation) + return 0; + + /* 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); } /** |