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

pNFS: Don't mark layout segments invalid on layoutreturn in pnfs_roc

Browse Source 
The layoutreturn call will take care of invalidating the layout segments
once the call is successful.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2016-11-15 18:29:59 -05:00
parent 94e5c571fc
commit 69820d22c5
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/nfs/pnfs.c
View File

@ -1205,22 +1205,28 @@ bool pnfs_roc(struct inode *ino)
goto out_noroc; goto out_noroc;
} }
/* always send layoutreturn if being marked so */
if (test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags))
layoutreturn = pnfs_prepare_layoutreturn(lo,
&stateid, NULL);
list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list) list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list) {
/* If we are sending layoutreturn, invalidate all valid lsegs */ /* If we are sending layoutreturn, invalidate all valid lsegs */
if (layoutreturn || test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) { if (test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) {
mark_lseg_invalid(lseg, &tmp_list); mark_lseg_invalid(lseg, &tmp_list);
found = true; found = true;
} }
}
/* always send layoutreturn if being marked so */
if (test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags)) {
layoutreturn = pnfs_prepare_layoutreturn(lo,
&stateid, NULL);
if (layoutreturn)
goto out_noroc;
}
/* ROC in two conditions: /* ROC in two conditions:
* 1. there are ROC lsegs * 1. there are ROC lsegs
* 2. we don't send layoutreturn * 2. we don't send layoutreturn
*/ */
if (found && !layoutreturn) { if (found) {
/* lo ref dropped in pnfs_roc_release() */ /* lo ref dropped in pnfs_roc_release() */
pnfs_get_layout_hdr(lo); pnfs_get_layout_hdr(lo);
roc = true; roc = true;