Commit a9901899 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: Add infrastructure for cleaning up per-layout commit structures 



Ensure that both the file and flexfiles layout types clean up when
freeing the layout segments.

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

fs/nfs/filelayout/filelayout.c

+16 −0
Original line number Diff line number Diff line
@@ -750,11 +750,16 @@ filelayout_free_lseg(struct pnfs_layout_segment *lseg) 
	/* This assumes a single RW lseg */

	if (lseg->pls_range.iomode == IOMODE_RW) {

		struct nfs4_filelayout *flo;

		struct inode *inode;



		flo = FILELAYOUT_FROM_HDR(lseg->pls_layout);

		inode = flo->generic_hdr.plh_inode;

		spin_lock(&inode->i_lock);

		flo->commit_info.nbuckets = 0;

		kfree(flo->commit_info.buckets);

		flo->commit_info.buckets = NULL;

		pnfs_generic_ds_cinfo_release_lseg(&flo->commit_info, lseg);

		spin_unlock(&inode->i_lock);

	}

	_filelayout_free_lseg(fl);

}
@@ -1163,6 +1168,16 @@ filelayout_get_ds_info(struct inode *inode) 
		return &FILELAYOUT_FROM_HDR(layout)->commit_info;

}



static void

filelayout_release_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct inode *inode)

{

	spin_lock(&inode->i_lock);

	pnfs_generic_ds_cinfo_destroy(fl_cinfo);

	spin_unlock(&inode->i_lock);

}





static struct pnfs_layoutdriver_type filelayout_type = {

	.id			= LAYOUT_NFSV4_1_FILES,

	.name			= "LAYOUT_NFSV4_1_FILES",
@@ -1176,6 +1191,7 @@ static struct pnfs_layoutdriver_type filelayout_type = { 
	.pg_read_ops		= &filelayout_pg_read_ops,

	.pg_write_ops		= &filelayout_pg_write_ops,

	.get_ds_info		= &filelayout_get_ds_info,

	.release_ds_info	= filelayout_release_ds_info,

	.mark_request_commit	= filelayout_mark_request_commit,

	.clear_request_commit	= pnfs_generic_clear_request_commit,

	.scan_commit_lists	= pnfs_generic_scan_commit_lists,

fs/nfs/flexfilelayout/flexfilelayout.c

+11 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ ff_layout_free_lseg(struct pnfs_layout_segment *lseg) 
			kfree(ffl->commit_info.buckets);

			ffl->commit_info.buckets = NULL;

		}

		pnfs_generic_ds_cinfo_release_lseg(&ffl->commit_info, lseg);

		spin_unlock(&inode->i_lock);

	}

	_ff_layout_free_lseg(fls);
@@ -2003,6 +2004,15 @@ ff_layout_get_ds_info(struct inode *inode) 
	return &FF_LAYOUT_FROM_HDR(layout)->commit_info;

}



static void

ff_layout_release_ds_info(struct pnfs_ds_commit_info *fl_cinfo,

		struct inode *inode)

{

	spin_lock(&inode->i_lock);

	pnfs_generic_ds_cinfo_destroy(fl_cinfo);

	spin_unlock(&inode->i_lock);

}



static void

ff_layout_free_deviceid_node(struct nfs4_deviceid_node *d)

{
@@ -2503,6 +2513,7 @@ static struct pnfs_layoutdriver_type flexfilelayout_type = { 
	.pg_read_ops		= &ff_layout_pg_read_ops,

	.pg_write_ops		= &ff_layout_pg_write_ops,

	.get_ds_info		= ff_layout_get_ds_info,

	.release_ds_info	= ff_layout_release_ds_info,

	.free_deviceid_node	= ff_layout_free_deviceid_node,

	.mark_request_commit	= pnfs_layout_mark_request_commit,

	.clear_request_commit	= pnfs_generic_clear_request_commit,

fs/nfs/internal.h

+3 −1
Original line number Diff line number Diff line
@@ -534,9 +534,11 @@ void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo) 
	pnfs_bucket_clear_pnfs_ds_commit_verifiers(cinfo->buckets,

			cinfo->nbuckets);



	list_for_each_entry(array, &cinfo->commits, cinfo_list)

	rcu_read_lock();

	list_for_each_entry_rcu(array, &cinfo->commits, cinfo_list)

		pnfs_bucket_clear_pnfs_ds_commit_verifiers(array->buckets,

				array->nbuckets);

	rcu_read_unlock();

}

#else

static inline

fs/nfs/pnfs.c

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ pnfs_init_lseg(struct pnfs_layout_hdr *lo, struct pnfs_layout_segment *lseg, 
{

	INIT_LIST_HEAD(&lseg->pls_list);

	INIT_LIST_HEAD(&lseg->pls_lc_list);

	INIT_LIST_HEAD(&lseg->pls_commits);

	refcount_set(&lseg->pls_refcount, 1);

	set_bit(NFS_LSEG_VALID, &lseg->pls_flags);

	lseg->pls_layout = lo;

fs/nfs/pnfs.h

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ struct nfs4_pnfs_ds { 
struct pnfs_layout_segment {

	struct list_head pls_list;

	struct list_head pls_lc_list;

	struct list_head pls_commits;

	struct pnfs_layout_range pls_range;

	refcount_t pls_refcount;

	u32 pls_seq;
@@ -370,6 +371,9 @@ void nfs4_deviceid_purge_client(const struct nfs_client *); 
/* pnfs_nfs.c */

struct pnfs_commit_array *pnfs_alloc_commit_array(size_t n, gfp_t gfp_flags);

void pnfs_free_commit_array(struct pnfs_commit_array *p);

void pnfs_generic_ds_cinfo_release_lseg(struct pnfs_ds_commit_info *fl_cinfo,

		struct pnfs_layout_segment *lseg);

void pnfs_generic_ds_cinfo_destroy(struct pnfs_ds_commit_info *fl_cinfo);



void pnfs_generic_clear_request_commit(struct nfs_page *req,

				       struct nfs_commit_info *cinfo);