Commit c88953d8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Trond Myklebust
Browse files

pnfs: add return_range method 



If a layout driver keeps per-inode state outside of the layout segments it
needs to be notified of any layout returns or recalls on an inode, and not
just about the freeing of layout segments.  Add a method to acomplish this,
which will allow the block layout driver to handle the case of truncated
and re-expanded files properly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 612aa983

fs/nfs/callback_proc.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -181,10 +181,16 @@ static u32 initiate_file_draining(struct nfs_client *clp, 
	spin_lock(&ino->i_lock);

	spin_lock(&ino->i_lock);

	if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags) ||

	if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags) ||

	    pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,

	    pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,

					&args->cbl_range))

					&args->cbl_range)) {

		rv = NFS4ERR_DELAY;

		rv = NFS4ERR_DELAY;

	else

		goto unlock;

		rv = NFS4ERR_NOMATCHING_LAYOUT;

	}



	if (NFS_SERVER(ino)->pnfs_curr_ld->return_range) {

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

			&args->cbl_range);

	}

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);

	pnfs_put_layout_hdr(lo);

	pnfs_put_layout_hdr(lo);

fs/nfs/pnfs.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -857,6 +857,16 @@ _pnfs_return_layout(struct inode *ino) 
	empty = list_empty(&lo->plh_segs);

	empty = list_empty(&lo->plh_segs);

	pnfs_clear_layoutcommit(ino, &tmp_list);

	pnfs_clear_layoutcommit(ino, &tmp_list);

	pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL);

	pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL);



	if (NFS_SERVER(ino)->pnfs_curr_ld->return_range) {

		struct pnfs_layout_range range = {

			.iomode		= IOMODE_ANY,

			.offset		= 0,

			.length		= NFS4_MAX_UINT64,

		};

		NFS_SERVER(ino)->pnfs_curr_ld->return_range(lo, &range);

	}



	/* Don't send a LAYOUTRETURN if list was initially empty */

	/* Don't send a LAYOUTRETURN if list was initially empty */

	if (empty) {

	if (empty) {

		spin_unlock(&ino->i_lock);

		spin_unlock(&ino->i_lock);

fs/nfs/pnfs.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,9 @@ struct pnfs_layoutdriver_type { 
	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_hdr *layoutid, struct nfs4_layoutget_res *lgr, gfp_t gfp_flags);

	struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_hdr *layoutid, struct nfs4_layoutget_res *lgr, gfp_t gfp_flags);

	void (*free_lseg) (struct pnfs_layout_segment *lseg);

	void (*free_lseg) (struct pnfs_layout_segment *lseg);





	void (*return_range) (struct pnfs_layout_hdr *lo,

			      struct pnfs_layout_range *range);



	/* test for nfs page cache coalescing */

	/* test for nfs page cache coalescing */

	const struct nfs_pageio_ops *pg_read_ops;

	const struct nfs_pageio_ops *pg_read_ops;

	const struct nfs_pageio_ops *pg_write_ops;

	const struct nfs_pageio_ops *pg_write_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE