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

Commit d51316b1 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: Don't discard pNFS layout segments that are marked for return 



commit 39fd01863616964f009599e50ca5c6ea9ebf88d6 upstream.

If the pNFS layout segment is marked with the NFS_LSEG_LAYOUTRETURN
flag, then the assumption is that it has some reporting requirement
to perform through a layoutreturn (e.g. flexfiles layout stats or error
information).

Fixes: e0b7d420 ("pNFS: Don't discard layout segments that are marked for return")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b2162db

fs/nfs/pnfs.c

+5 −0
Original line number Diff line number Diff line
@@ -2359,6 +2359,9 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, 


	assert_spin_locked(&lo->plh_inode->i_lock);



	if (test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags))

		tmp_list = &lo->plh_return_segs;



	list_for_each_entry_safe(lseg, next, &lo->plh_segs, pls_list)

		if (pnfs_match_lseg_recall(lseg, return_range, seq)) {

			dprintk("%s: marking lseg %p iomode %d "
@@ -2366,6 +2369,8 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, 
				lseg, lseg->pls_range.iomode,

				lseg->pls_range.offset,

				lseg->pls_range.length);

			if (test_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags))

				tmp_list = &lo->plh_return_segs;

			if (mark_lseg_invalid(lseg, tmp_list))

				continue;

			remaining++;