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

Commit ca2c316f authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Greg Kroah-Hartman
Browse files

NFS: commit direct writes even if they fail partially 



commit 1b8d97b0a837beaf48a8449955b52c650a7114b4 upstream.

If some of the WRITE calls making up an O_DIRECT write syscall fail,
we neglect to commit, even if some of the WRITEs succeed.

We also depend on the commit code to free the reference count on the
nfs_page taken in the "if (request_commit)" case at the end of
nfs_direct_write_completion().  The problem was originally noticed
because ENOSPC's encountered partway through a write would result in a
closed file being sillyrenamed when it should have been unlinked.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1840343

fs/nfs/direct.c

+1 −3
Original line number Diff line number Diff line
@@ -787,10 +787,8 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) 


	spin_lock(&dreq->lock);



	if (test_bit(NFS_IOHDR_ERROR, &hdr->flags)) {

		dreq->flags = 0;

	if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))

		dreq->error = hdr->error;

	}

	if (dreq->error == 0) {

		nfs_direct_good_bytes(dreq, hdr);

		if (nfs_write_need_commit(hdr)) {