Commit 55051c0c authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

nfs: always check dreq->error after a commit 

When the client gets back a short DIO write, it will then attempt to
issue another write to finish the DIO request. If that write then fails
(as is often the case in an -ENOSPC situation), then we still may need
to issue a COMMIT if the earlier short write was unstable. If that COMMIT
then succeeds, then we don't want the client to reschedule the write
requests, and to instead just return a short write. Otherwise, we can
end up looping over the same DIO write forever.

Always consult dreq->error after a successful RPC, even when the flag
state is not NFS_ODIRECT_DONE.

Link: https://bugzilla.redhat.com/show_bug.cgi?id=2028370


Reported-by: default avatarBoyang Xue <bxue@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 8efc4bbe

fs/nfs/direct.c

+2 −1
Original line number Diff line number Diff line
@@ -571,8 +571,9 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data) 
		dreq->max_count = 0;

		dreq->count = 0;

		dreq->flags = NFS_ODIRECT_DONE;

	} else if (dreq->flags == NFS_ODIRECT_DONE)

	} else {

		status = dreq->error;

	}



	nfs_init_cinfo_from_dreq(&cinfo, dreq);