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

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

pNFS: Always set NFS_LAYOUT_RETURN_REQUESTED with lo->plh_return_iomode 



When setting the layout return mode, we must always also set the
NFS_LAYOUT_RETURN_REQUESTED flag to ensure that we send a layoutreturn.
Otherwise pnfs_error_mark_layout_for_return() could set the mode, but
fail to send the layoutreturn because another is already in flight.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 2f215968

fs/nfs/pnfs.c

+1 −2
Original line number Diff line number Diff line
@@ -1738,6 +1738,7 @@ pnfs_set_plh_return_iomode(struct pnfs_layout_hdr *lo, enum pnfs_iomode iomode) 
	if (lo->plh_return_iomode != 0)

		iomode = IOMODE_ANY;

	lo->plh_return_iomode = iomode;

	set_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags);

}



/**
@@ -1777,8 +1778,6 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, 
			remaining++;

			set_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags);

			pnfs_set_plh_return_iomode(lo, return_range->iomode);

			set_bit(NFS_LAYOUT_RETURN_REQUESTED,

					&lo->plh_flags);

		}

	return remaining;

}