diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-17 12:57:07 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-09-30 11:13:08 +0200 |
| commit | a6209e19d879aa077c3e58fc8ba38a3ffb1f61da (patch) | |
| tree | 22e5f2b6d2b583689a05f185ef0a5bf7f212eabb | |
| parent | d71ea882b4c5e2f23b6631f6f546b6b1756a7d93 (diff) | |
| download | lwn-a6209e19d879aa077c3e58fc8ba38a3ffb1f61da.tar.gz lwn-a6209e19d879aa077c3e58fc8ba38a3ffb1f61da.zip | |
NFS: nfs_set_pgio_error sometimes misses errors
commit e9ae58aeee8842a50f7e199d602a5ccb2e41a95f upstream.
We should ensure that we always set the pgio_header's error field
if a READ or WRITE RPC call returns an error. The current code depends
on 'hdr->good_bytes' always being initialised to a large value, which
is not always done correctly by callers.
When this happens, applications may end up missing important errors.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/nfs/pagelist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 27d7f2742592..11763ce73709 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -60,8 +60,8 @@ EXPORT_SYMBOL_GPL(nfs_pgheader_init); void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos) { spin_lock(&hdr->lock); - if (pos < hdr->io_start + hdr->good_bytes) { - set_bit(NFS_IOHDR_ERROR, &hdr->flags); + if (!test_and_set_bit(NFS_IOHDR_ERROR, &hdr->flags) + || pos < hdr->io_start + hdr->good_bytes) { clear_bit(NFS_IOHDR_EOF, &hdr->flags); hdr->good_bytes = pos - hdr->io_start; hdr->error = error; |