iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pNFS: Wait on outstanding layoutreturns to complete in pnfs_roc()

Browse Source 
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2016-11-30 16:23:38 -05:00
parent abb3e1c877
commit 29ade5db12
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfs/pnfs.c
View File

@ -1245,11 +1245,20 @@ bool pnfs_roc(struct inode *ino,
if (!nfs_have_layout(ino)) if (!nfs_have_layout(ino))
return false; return false;
retry:
spin_lock(&ino->i_lock); spin_lock(&ino->i_lock);
lo = nfsi->layout; lo = nfsi->layout;
if (!lo || !pnfs_layout_is_valid(lo) || if (!lo || !pnfs_layout_is_valid(lo) ||
test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags)) test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags))
goto out_noroc; goto out_noroc;
if (test_bit(NFS_LAYOUT_RETURN_LOCK, &lo->plh_flags)) {
pnfs_get_layout_hdr(lo);
spin_unlock(&ino->i_lock);
wait_on_bit(&lo->plh_flags, NFS_LAYOUT_RETURN,
TASK_UNINTERRUPTIBLE);
pnfs_put_layout_hdr(lo);
goto retry;
}
/* no roc if we hold a delegation */ /* no roc if we hold a delegation */
if (nfs4_check_delegation(ino, FMODE_READ)) if (nfs4_check_delegation(ino, FMODE_READ))