diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-24 18:14:34 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 02:06:12 -0500 |
commit | e6f810759505bc86c009854b82cc495ffd8eb020 (patch) | |
tree | 1590631fe3b222d49015dd53b421a5547e13e4dc /fs/nfs/dir.c | |
parent | 99fadcd76465842c014c88b8c9c19b457e9debc0 (diff) |
NFS: Add an asynchronous delegreturn operation for use in nfs_clear_inode
Otherwise, there is a potential deadlock if the last dput() from an NFSv4
close() or other asynchronous operation leads to nfs_clear_inode calling
the synchronous delegreturn.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c578d942f000..5ca762de88bf 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -864,7 +864,6 @@ static int nfs_dentry_delete(struct dentry *dentry) | |||
864 | */ | 864 | */ |
865 | static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode) | 865 | static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode) |
866 | { | 866 | { |
867 | nfs_inode_return_delegation(inode); | ||
868 | if (S_ISDIR(inode->i_mode)) | 867 | if (S_ISDIR(inode->i_mode)) |
869 | /* drop any readdir cache as it could easily be old */ | 868 | /* drop any readdir cache as it could easily be old */ |
870 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA; | 869 | NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA; |