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

Commit 57036a37 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Rename the pnfs_put_lseg_common to pnfs_layout_remove_lseg 



The latter name is more descriptive of the actual function.
Also rename pnfs_insert_layout to pnfs_layout_insert_lseg.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bb346f63

fs/nfs/pnfs.c

+15 −12
Original line number Diff line number Diff line
@@ -319,21 +319,22 @@ static void free_lseg(struct pnfs_layout_segment *lseg) 
	struct inode *ino = lseg->pls_layout->plh_inode;



	NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);

	/* Matched by pnfs_get_layout_hdr in pnfs_insert_layout */

	/* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */

	pnfs_put_layout_hdr(NFS_I(ino)->layout);

}



static void

pnfs_put_lseg_common(struct pnfs_layout_segment *lseg)

pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo,

		struct pnfs_layout_segment *lseg)

{

	struct inode *inode = lseg->pls_layout->plh_inode;

	struct inode *inode = lo->plh_inode;



	WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags));

	list_del_init(&lseg->pls_list);

	if (list_empty(&lseg->pls_layout->plh_segs)) {

		set_bit(NFS_LAYOUT_DESTROYED, &lseg->pls_layout->plh_flags);

	if (list_empty(&lo->plh_segs)) {

		set_bit(NFS_LAYOUT_DESTROYED, &lo->plh_flags);

		/* Matched by initial refcount set in alloc_init_layout_hdr */

		pnfs_put_layout_hdr_locked(lseg->pls_layout);

		pnfs_put_layout_hdr_locked(lo);

	}

	rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq);

}
@@ -341,6 +342,7 @@ pnfs_put_lseg_common(struct pnfs_layout_segment *lseg) 
void

pnfs_put_lseg(struct pnfs_layout_segment *lseg)

{

	struct pnfs_layout_hdr *lo;

	struct inode *inode;



	if (!lseg)
@@ -349,13 +351,14 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg) 
	dprintk("%s: lseg %p ref %d valid %d\n", __func__, lseg,

		atomic_read(&lseg->pls_refcount),

		test_bit(NFS_LSEG_VALID, &lseg->pls_flags));

	inode = lseg->pls_layout->plh_inode;

	lo = lseg->pls_layout;

	inode = lo->plh_inode;

	if (atomic_dec_and_lock(&lseg->pls_refcount, &inode->i_lock)) {

		LIST_HEAD(free_me);



		pnfs_put_lseg_common(lseg);

		list_add(&lseg->pls_list, &free_me);

		pnfs_layout_remove_lseg(lo, lseg);

		spin_unlock(&inode->i_lock);

		list_add(&lseg->pls_list, &free_me);

		pnfs_free_lseg_list(&free_me);

	}

}
@@ -443,7 +446,7 @@ static int mark_lseg_invalid(struct pnfs_layout_segment *lseg, 
		dprintk("%s: lseg %p ref %d\n", __func__, lseg,

			atomic_read(&lseg->pls_refcount));

		if (atomic_dec_and_test(&lseg->pls_refcount)) {

			pnfs_put_lseg_common(lseg);

			pnfs_layout_remove_lseg(lseg->pls_layout, lseg);

			list_add(&lseg->pls_list, tmp_list);

			rv = 1;

		}
@@ -861,7 +864,7 @@ cmp_layout(struct pnfs_layout_range *l1, 
}



static void

pnfs_insert_layout(struct pnfs_layout_hdr *lo,

pnfs_layout_insert_lseg(struct pnfs_layout_hdr *lo,

		   struct pnfs_layout_segment *lseg)

{

	struct pnfs_layout_segment *lp;
@@ -1211,7 +1214,7 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
	init_lseg(lo, lseg);

	lseg->pls_range = res->range;

	pnfs_get_lseg(lseg);

	pnfs_insert_layout(lo, lseg);

	pnfs_layout_insert_lseg(lo, lseg);



	if (res->return_on_close) {

		set_bit(NFS_LSEG_ROC, &lseg->pls_flags);