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

Commit 0654cc72 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1/pNFS: Add a helper to mark the layout as returned 



This ensures that we don't reuse the stateid if a layout return or
implied layout return means that we've returned all layout segments

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent ab7d763e

fs/nfs/callback_proc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ static u32 initiate_file_draining(struct nfs_client *clp, 
		NFS_SERVER(ino)->pnfs_curr_ld->return_range(lo,

		NFS_SERVER(ino)->pnfs_curr_ld->return_range(lo,

			&args->cbl_range);

			&args->cbl_range);

	}

	}

	pnfs_mark_layout_returned_if_empty(lo);

unlock:

unlock:

	spin_unlock(&ino->i_lock);

	spin_unlock(&ino->i_lock);

	pnfs_free_lseg_list(&free_me_list);

	pnfs_free_lseg_list(&free_me_list);

fs/nfs/nfs4proc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -8049,9 +8049,10 @@ static void nfs4_layoutreturn_release(void *calldata) 




	dprintk("--> %s\n", __func__);

	dprintk("--> %s\n", __func__);

	spin_lock(&lo->plh_inode->i_lock);

	spin_lock(&lo->plh_inode->i_lock);

	pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range);

	pnfs_mark_layout_returned_if_empty(lo);

	if (lrp->res.lrs_present)

	if (lrp->res.lrs_present)

		pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);

		pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);

	pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range);

	pnfs_clear_layoutreturn_waitbit(lo);

	pnfs_clear_layoutreturn_waitbit(lo);

	lo->plh_block_lgets--;

	lo->plh_block_lgets--;

	spin_unlock(&lo->plh_inode->i_lock);

	spin_unlock(&lo->plh_inode->i_lock);

fs/nfs/pnfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1149,6 +1149,7 @@ void pnfs_roc_set_barrier(struct inode *ino, u32 barrier) 




	spin_lock(&ino->i_lock);

	spin_lock(&ino->i_lock);

	lo = NFS_I(ino)->layout;

	lo = NFS_I(ino)->layout;

	pnfs_mark_layout_returned_if_empty(lo);

	if (pnfs_seqid_is_newer(barrier, lo->plh_barrier))

	if (pnfs_seqid_is_newer(barrier, lo->plh_barrier))

		lo->plh_barrier = barrier;

		lo->plh_barrier = barrier;

	spin_unlock(&ino->i_lock);

	spin_unlock(&ino->i_lock);

fs/nfs/pnfs.h

+13 −0
Original line number Original line Diff line number Diff line
@@ -556,6 +556,19 @@ pnfs_calc_offset_length(u64 offset, u64 end) 
	return 1 + end - offset;

	return 1 + end - offset;

}

}





/**

 * pnfs_mark_layout_returned_if_empty - marks the layout as returned

 * @lo: layout header

 *

 * Note: Caller must hold inode->i_lock

 */

static inline void

pnfs_mark_layout_returned_if_empty(struct pnfs_layout_hdr *lo)

{

	if (list_empty(&lo->plh_segs))

		set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);

}



extern unsigned int layoutstats_timer;

extern unsigned int layoutstats_timer;





#ifdef NFS_DEBUG

#ifdef NFS_DEBUG