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

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

pNFS: Clear NFS_LAYOUT_RETURN_REQUESTED when invalidating the layout stateid 



We must ensure that we don't schedule a layoutreturn if the layout stateid
has been marked as invalid.

Fixes: 2a59a041 ("pNFS: Fix pnfs_set_layout_stateid() to clear...")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Cc: stable@vger.kernel.org # v4.8+
parent 7b650994

fs/nfs/pnfs.c

+9 −8
Original line number Diff line number Diff line
@@ -299,6 +299,14 @@ pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo) 
	}

}



static void

pnfs_clear_layoutreturn_info(struct pnfs_layout_hdr *lo)

{

	lo->plh_return_iomode = 0;

	lo->plh_return_seq = 0;

	clear_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags);

}



/*

 * Mark a pnfs_layout_hdr and all associated layout segments as invalid

 *
@@ -317,6 +325,7 @@ pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo, 
	};



	set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);

	pnfs_clear_layoutreturn_info(lo);

	return pnfs_mark_matching_lsegs_invalid(lo, lseg_list, &range, 0);

}
@@ -818,14 +827,6 @@ pnfs_destroy_all_layouts(struct nfs_client *clp) 
	pnfs_destroy_layouts_byclid(clp, false);

}



static void

pnfs_clear_layoutreturn_info(struct pnfs_layout_hdr *lo)

{

	lo->plh_return_iomode = 0;

	lo->plh_return_seq = 0;

	clear_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags);

}



/* update lo->plh_stateid with new if is more recent */

void

pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,