TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4: Pin the superblock while we're returning the delegation

Browse Source 
This patch ensures that the superblock doesn't go ahead and disappear
underneath us while the state manager thread is returning delegations.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust
2015-02-26 09:57:34 -05:00
parent ade04647dd
commit 9f0f8e12c4
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/nfs/delegation.c
+16 -4
View File
@@ -474,14 +474,20 @@ restart:
super_list) { super_list) {
if (!nfs_delegation_need_return(delegation)) if (!nfs_delegation_need_return(delegation))
continue; continue;
inode = nfs_delegation_grab_inode(delegation); if (!nfs_sb_active(server->super))
if (inode == NULL)
continue; continue;
inode = nfs_delegation_grab_inode(delegation);
if (inode == NULL) {
rcu_read_unlock();
nfs_sb_deactive(server->super);
goto restart;
}
delegation = nfs_start_delegation_return_locked(NFS_I(inode)); delegation = nfs_start_delegation_return_locked(NFS_I(inode));
rcu_read_unlock(); rcu_read_unlock();
err = nfs_end_delegation_return(inode, delegation, 0); err = nfs_end_delegation_return(inode, delegation, 0);
iput(inode); iput(inode);
nfs_sb_deactive(server->super);
if (!err) if (!err)
goto restart; goto restart;
set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state); set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state);
@@ -815,9 +821,14 @@ restart:
if (test_bit(NFS_DELEGATION_NEED_RECLAIM, if (test_bit(NFS_DELEGATION_NEED_RECLAIM,
&delegation->flags) == 0) &delegation->flags) == 0)
continue; continue;
inode = nfs_delegation_grab_inode(delegation); if (!nfs_sb_active(server->super))
if (inode == NULL)
continue; continue;
inode = nfs_delegation_grab_inode(delegation);
if (inode == NULL) {
rcu_read_unlock();
nfs_sb_deactive(server->super);
goto restart;
}
delegation = nfs_start_delegation_return_locked(NFS_I(inode)); delegation = nfs_start_delegation_return_locked(NFS_I(inode));
rcu_read_unlock(); rcu_read_unlock();
if (delegation != NULL) { if (delegation != NULL) {
@@ -827,6 +838,7 @@ restart:
nfs_free_delegation(delegation); nfs_free_delegation(delegation);
} }
iput(inode); iput(inode);
nfs_sb_deactive(server->super);
goto restart; goto restart;
} }
} }