mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 18:13:41 +02:00
NFS: use a local RCU critical section in nfs_start_delegation_return
Nested RCU critical sections are fine and very cheap. Have a local one in nfs_start_delegation_return so that the function is self-contained and to prepare for simplifying the callers. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
This commit is contained in:
parent
36e3e9387b
commit
3365322401
|
|
@ -309,11 +309,13 @@ nfs_start_delegation_return(struct nfs_inode *nfsi)
|
|||
struct nfs_delegation *delegation;
|
||||
bool return_now = false;
|
||||
|
||||
lockdep_assert_in_rcu_read_lock();
|
||||
|
||||
rcu_read_lock();
|
||||
delegation = rcu_dereference(nfsi->delegation);
|
||||
if (!delegation || !refcount_inc_not_zero(&delegation->refcount))
|
||||
if (!delegation || !refcount_inc_not_zero(&delegation->refcount)) {
|
||||
rcu_read_unlock();
|
||||
return NULL;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
spin_lock(&delegation->lock);
|
||||
if (delegation->inode &&
|
||||
|
|
@ -767,10 +769,7 @@ int nfs4_inode_return_delegation(struct inode *inode)
|
|||
struct nfs_delegation *delegation;
|
||||
int err;
|
||||
|
||||
rcu_read_lock();
|
||||
delegation = nfs_start_delegation_return(nfsi);
|
||||
rcu_read_unlock();
|
||||
|
||||
if (!delegation)
|
||||
return 0;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user