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

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

pNFS: Mark layout for return if return-on-close was not sent 



commit 67bbceedc9bb8ad48993a8bd6486054756d711f4 upstream.

If the layout return-on-close failed because the layoutreturn was never
sent, then we should mark the layout for return again.

Fixes: 9c47b18cf722 ("pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 825e0ffa

fs/nfs/pnfs.c

+6 −0
Original line number Diff line number Diff line
@@ -1460,12 +1460,18 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args, 
		int ret)

{

	struct pnfs_layout_hdr *lo = args->layout;

	struct inode *inode = args->inode;

	const nfs4_stateid *arg_stateid = NULL;

	const nfs4_stateid *res_stateid = NULL;

	struct nfs4_xdr_opaque_data *ld_private = args->ld_private;



	switch (ret) {

	case -NFS4ERR_NOMATCHING_LAYOUT:

		spin_lock(&inode->i_lock);

		if (pnfs_layout_is_valid(lo) &&

		    nfs4_stateid_match_other(&args->stateid, &lo->plh_stateid))

			pnfs_set_plh_return_info(lo, args->range.iomode, 0);

		spin_unlock(&inode->i_lock);

		break;

	case 0:

		if (res->lrs_present)