summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2018-01-16 10:08:00 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2018-01-16 10:13:23 -0500
commit1b8d97b0a837beaf48a8449955b52c650a7114b4 (patch)
treee76a94b4ba58ce967fb1edb1763e7ee4ca18f434 /fs/nfs
parentf96adf1ea08a37e3739b1f929ce8318eee63b1f4 (diff)
downloadlinux-stable-1b8d97b0a837beaf48a8449955b52c650a7114b4.tar.gz
linux-stable-1b8d97b0a837beaf48a8449955b52c650a7114b4.tar.bz2
linux-stable-1b8d97b0a837beaf48a8449955b52c650a7114b4.zip
NFS: commit direct writes even if they fail partially
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: J. Bruce Fields <bfields@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/direct.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index d2972d537469..8c10b0562e75 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -775,10 +775,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)) {