diff options
| author | Trond Myklebust | 2015-02-26 19:59:38 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2015-03-03 00:09:13 +0100 |
| commit | b04b22f4ca691280f0ab3f77954f5a21500881e7 (patch) | |
| tree | b91de57ef1870cb38fe86b28cd975dca209c8697 | |
| parent | NFS: Fix stateid used for NFS v4 closes (diff) | |
| download | kernel-qcow2-linux-b04b22f4ca691280f0ab3f77954f5a21500881e7.tar.gz kernel-qcow2-linux-b04b22f4ca691280f0ab3f77954f5a21500881e7.tar.xz kernel-qcow2-linux-b04b22f4ca691280f0ab3f77954f5a21500881e7.zip | |
NFSv4: Ensure that we don't reap a delegation that is being returned
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/delegation.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 2e37d8315d92..d9caf73eef48 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -815,12 +815,14 @@ restart: inode = nfs_delegation_grab_inode(delegation); if (inode == NULL) continue; - delegation = nfs_detach_delegation(NFS_I(inode), - delegation, server); + delegation = nfs_start_delegation_return_locked(NFS_I(inode)); rcu_read_unlock(); - - if (delegation != NULL) - nfs_free_delegation(delegation); + if (delegation != NULL) { + delegation = nfs_detach_delegation(NFS_I(inode), + delegation, server); + if (delegation != NULL) + nfs_free_delegation(delegation); + } iput(inode); goto restart; } |