mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 15:22:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

NFS: drop the _locked postfix from nfs_start_delegation_return

Browse Source 
Now that nfs_start_delegation_return_locked is gone, and we have
RCU locking asserts, drop the extra postfix.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
This commit is contained in:
Christoph Hellwig
2026-01-07 08:26:59 +01:00
committed by Anna Schumaker
parent 7c80c3b8c8
commit 0513044b74
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/delegation.c
View File

@@ -315,7 +315,7 @@ static struct inode *nfs_delegation_grab_inode(struct nfs_delegation *delegation
}
static struct nfs_delegation *
nfs_start_delegation_return_locked(struct nfs_inode *nfsi)
nfs_start_delegation_return(struct nfs_inode *nfsi)
{
struct nfs_delegation *ret = NULL;
struct nfs_delegation *delegation;
@@ -588,7 +588,7 @@ static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation
out_return:
err = nfs_do_return_delegation(inode, delegation, issync);
out:
/* Refcount matched in nfs_start_delegation_return_locked() */
/* Refcount matched in nfs_start_delegation_return() */
nfs_put_delegation(delegation);
return err;
}
@@ -663,7 +663,7 @@ static int nfs_server_return_marked_delegations(struct nfs_server *server,
}
}
delegation = nfs_start_delegation_return_locked(NFS_I(inode));
delegation = nfs_start_delegation_return(NFS_I(inode));
rcu_read_unlock();
iput(to_put);
@@ -786,7 +786,7 @@ int nfs4_inode_return_delegation(struct inode *inode)
struct nfs_delegation *delegation;
rcu_read_lock();
delegation = nfs_start_delegation_return_locked(nfsi);
delegation = nfs_start_delegation_return(nfsi);
rcu_read_unlock();
if (!delegation)
@@ -1263,13 +1263,13 @@ static int nfs_server_reap_unclaimed_delegations(struct nfs_server *server,
inode = nfs_delegation_grab_inode(delegation);
if (inode == NULL)
continue;
delegation = nfs_start_delegation_return_locked(NFS_I(inode));
delegation = nfs_start_delegation_return(NFS_I(inode));
rcu_read_unlock();
if (delegation != NULL) {
if (nfs_detach_delegation(NFS_I(inode), delegation,
server) != NULL)
nfs_free_delegation(server, delegation);
/* Match nfs_start_delegation_return_locked */
/* Match nfs_start_delegation_return */
nfs_put_delegation(delegation);
}
iput(inode);