Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3976143b authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

NFS41: remove NFS_LAYOUT_ROC flag 



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: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 249b2eef

fs/nfs/pnfs.c

+2 −5
Original line number Diff line number Diff line
@@ -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);

fs/nfs/pnfs.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ enum { 
	NFS_LAYOUT_RO_FAILED = 0,	/* get ro layout failed stop trying */

	NFS_LAYOUT_RW_FAILED,		/* get rw layout failed stop trying */

	NFS_LAYOUT_BULK_RECALL,		/* bulk recall affecting layout */

	NFS_LAYOUT_ROC,			/* some lseg had roc bit set */

	NFS_LAYOUT_RETURN,		/* Return this layout ASAP */

	NFS_LAYOUT_RETURN_BEFORE_CLOSE,	/* Return this layout before close */

	NFS_LAYOUT_INVALID_STID,	/* layout stateid id is invalid */