mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 18:13:41 +02:00
NFS: Don't immediately return directory delegations when disabled
The function nfs_inode_evict_delegation() immediately and synchronously
returns a delegation when called. This means we can't call it from
nfs4_have_delegation(), since that function could be called under a
lock. Instead we should mark the delegation for return and let the state
manager handle it for us.
Fixes: b6d2a520f4 ("NFS: Add a module option to disable directory delegations")
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
parent
60699ab7cb
commit
803e18641f
|
|
@ -149,7 +149,7 @@ static int nfs4_do_check_delegation(struct inode *inode, fmode_t type,
|
|||
int nfs4_have_delegation(struct inode *inode, fmode_t type, int flags)
|
||||
{
|
||||
if (S_ISDIR(inode->i_mode) && !directory_delegations)
|
||||
nfs_inode_evict_delegation(inode);
|
||||
nfs4_inode_set_return_delegation_on_close(inode);
|
||||
return nfs4_do_check_delegation(inode, type, flags, true);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user