Commit d72b7963 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Fix clearing of layout segments in layoutreturn 



Make sure that we clear the layout segments in cases where we see a
fatal error, and also in the case where the layout is invalid.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent a017ad13

fs/nfs/nfs4proc.c

+6 −3
Original line number Diff line number Diff line
@@ -9998,6 +9998,7 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) 
		fallthrough;

	default:

		task->tk_status = 0;

		lrp->res.lrs_present = 0;

		fallthrough;

	case 0:

		break;
@@ -10011,9 +10012,11 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) 
		task->tk_status = 0;

		break;

	case -NFS4ERR_DELAY:

		if (nfs4_async_handle_error(task, server, NULL, NULL) != -EAGAIN)

			break;

		if (nfs4_async_handle_error(task, server, NULL, NULL) ==

		    -EAGAIN)

			goto out_restart;

		lrp->res.lrs_present = 0;

		break;

	}

	return;

out_restart:

fs/nfs/pnfs.c

+2 −3
Original line number Diff line number Diff line
@@ -1284,10 +1284,9 @@ void pnfs_layoutreturn_free_lsegs(struct pnfs_layout_hdr *lo, 
	LIST_HEAD(freeme);



	spin_lock(&inode->i_lock);

	if (!pnfs_layout_is_valid(lo) ||

	    !nfs4_stateid_match_other(&lo->plh_stateid, arg_stateid))

	if (!nfs4_stateid_match_other(&lo->plh_stateid, arg_stateid))

		goto out_unlock;

	if (stateid) {

	if (stateid && pnfs_layout_is_valid(lo)) {

		u32 seq = be32_to_cpu(arg_stateid->seqid);



		pnfs_mark_matching_lsegs_invalid(lo, &freeme, range, seq);