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

Commit 49a85061 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Cleanup add a "pnfs_" prefix to mark_matching_lsegs_invalid 



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

fs/nfs/callback_proc.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static u32 initiate_file_draining(struct nfs_client *clp, 
	ino = lo->plh_inode;

	spin_lock(&ino->i_lock);

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

	    mark_matching_lsegs_invalid(lo, &free_me_list,

	    pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,

					&args->cbl_range))

		rv = NFS4ERR_DELAY;

	else
@@ -211,7 +211,7 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, 
		ino = lo->plh_inode;

		spin_lock(&ino->i_lock);

		set_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags);

		if (mark_matching_lsegs_invalid(lo, &free_me_list, &range))

		if (pnfs_mark_matching_lsegs_invalid(lo, &free_me_list, &range))

			rv = NFS4ERR_DELAY;

		list_del_init(&lo->plh_bulk_recall);

		spin_unlock(&ino->i_lock);

fs/nfs/pnfs.c

+3 −3
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int mark_lseg_invalid(struct pnfs_layout_segment *lseg, 
 * after call.

 */

int

mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,

pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,

			    struct list_head *tmp_list,

			    struct pnfs_layout_range *recall_range)

{
@@ -458,7 +458,7 @@ pnfs_destroy_layout(struct nfs_inode *nfsi) 
	lo = nfsi->layout;

	if (lo) {

		lo->plh_block_lgets++; /* permanently block new LAYOUTGETs */

		mark_matching_lsegs_invalid(lo, &tmp_list, NULL);

		pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL);

	}

	spin_unlock(&nfsi->vfs_inode.i_lock);

	pnfs_free_lseg_list(&tmp_list);
@@ -651,7 +651,7 @@ _pnfs_return_layout(struct inode *ino) 
	/* Reference matched in nfs4_layoutreturn_release */

	get_layout_hdr(lo);

	empty = list_empty(&lo->plh_segs);

	mark_matching_lsegs_invalid(lo, &tmp_list, NULL);

	pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL);

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

	if (empty) {

		spin_unlock(&ino->i_lock);

fs/nfs/pnfs.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, 
int pnfs_choose_layoutget_stateid(nfs4_stateid *dst,

				  struct pnfs_layout_hdr *lo,

				  struct nfs4_state *open_state);

int mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,

int pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,

				struct list_head *tmp_list,

				struct pnfs_layout_range *recall_range);

bool pnfs_roc(struct inode *ino);