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

NFSv4.1/pnfs: Don't prevent layoutgets when doing return-on-close

Browse Source 
If there is an outstanding return-on-close, then we just want new
layoutget requests to wait rather than fail.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2015-08-04 15:57:13 -04:00
parent 8f70f53a87
commit 5c4a79fb2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/pnfs.c
View File

@ -1105,7 +1105,9 @@ bool pnfs_roc(struct inode *ino)
} }
if (!found) if (!found)
goto out_noroc; goto out_noroc;
lo->plh_block_lgets++; if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))
goto out_noroc;
lo->plh_return_iomode = IOMODE_ANY;
pnfs_get_layout_hdr(lo); /* matched in pnfs_roc_release */ pnfs_get_layout_hdr(lo); /* matched in pnfs_roc_release */
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);
pnfs_free_lseg_list(&tmp_list); pnfs_free_lseg_list(&tmp_list);
@ -1133,7 +1135,7 @@ void pnfs_roc_release(struct inode *ino)
spin_lock(&ino->i_lock); spin_lock(&ino->i_lock);
lo = NFS_I(ino)->layout; lo = NFS_I(ino)->layout;
lo->plh_block_lgets--; pnfs_clear_layoutreturn_waitbit(lo);
if (atomic_dec_and_test(&lo->plh_refcount)) { if (atomic_dec_and_test(&lo->plh_refcount)) {
pnfs_detach_layout_hdr(lo); pnfs_detach_layout_hdr(lo);
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);