xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS41: remove NFS_LAYOUT_ROC flag

Browse Source 
If we return delegation before closing, we fail to do roc check
during close because NFS_LAYOUT_ROC is cleared by delegreturn
and it causes layouts to be still hanging around after delegreturn
+ close, which is a voilation against protocol.

Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Peng Tao
2015-08-21 12:49:44 +08:00
committed by Trond Myklebust
parent 249b2eef64
commit 3976143b06
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfs/pnfs.c
View File

@@ -1068,8 +1068,7 @@ bool pnfs_roc(struct inode *ino)
spin_lock(&ino->i_lock);
lo = nfsi->layout;
if (!lo || !test_and_clear_bit(NFS_LAYOUT_ROC, &lo->plh_flags) ||
test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags))
if (!lo || test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags))
goto out_noroc;
/* no roc if we hold a delegation */
@@ -1617,10 +1616,8 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
pnfs_get_lseg(lseg);
pnfs_layout_insert_lseg(lo, lseg);
if (res->return_on_close) {
if (res->return_on_close)
set_bit(NFS_LSEG_ROC, &lseg->pls_flags);
set_bit(NFS_LAYOUT_ROC, &lo->plh_flags);
}
spin_unlock(&ino->i_lock);
pnfs_free_lseg_list(&free_me);