linux-stable.git/fs/nfs, branch linux-5.2.y

NFS: remove set but not used variable 'mapping'

2019-09-21T05:18:37+00:00

[ Upstream commit 99300a85260c2b7febd57082a617d1062532067e ]

Fixes gcc '-Wunused-but-set-variable' warning:

fs/nfs/write.c: In function nfs_page_async_flush:
fs/nfs/write.c:609:24: warning: variable mapping set but not used [-Wunused-but-set-variable]

It is not use since commit aefb623c422e ("NFS: Fix
writepage(s) error handling to not report errors twice")

Reported-by: Hulk Robot 
Signed-off-by: YueHaibing 
Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFSv2: Fix write regression

2019-09-21T05:18:37+00:00

[ Upstream commit d33d4beb522987d1c305c12500796f9be3687dee ]

Ensure we update the write result count on success, since the
RPC call itself does not do so.

Reported-by: Jan Stancek 
Reported-by: Naresh Kamboju 
Signed-off-by: Trond Myklebust 
Tested-by: Jan Stancek 
Signed-off-by: Sasha Levin

NFSv2: Fix eof handling

2019-09-21T05:18:36+00:00

[ Upstream commit 71affe9be45a5c60b9772e1b2701710712637274 ]

If we received a reply from the server with a zero length read and
no error, then that implies we are at eof.

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFS: Fix writepage(s) error handling to not report errors twice

2019-09-21T05:18:35+00:00

[ Upstream commit 96c4145599b30c0eb6cbeaa24207802452dd1872 ]

If writepage()/writepages() saw an error, but handled it without
reporting it, we should not be re-reporting that error on exit.

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFS: Fix spurious EIO read errors

2019-09-21T05:18:35+00:00

[ Upstream commit 8f54c7a4babf58bbaf849e126f7ae9664bdc9e04 ]

If the client attempts to read a page, but the read fails due to some
spurious error (e.g. an ACCESS error or a timeout, ...) then we need
to allow other processes to retry.
Also try to report errors correctly when doing a synchronous readpage.

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

pNFS/flexfiles: Don't time out requests on hard mounts

2019-09-21T05:18:35+00:00

[ Upstream commit 7af46292dadcf8870946916f79fdddf79bd7267f ]

If the mount is hard, we should ignore the 'io_maxretrans' module
parameter so that we always keep retrying.

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFS: On fatal writeback errors, we need to call nfs_inode_remove_request()

2019-09-21T05:18:31+00:00

[ Upstream commit 06c9fdf3b9f1acc6e53753c99c54c39764cc979f ]

If the writeback error is fatal, we need to remove the tracking structures
(i.e. the nfs_page) from the inode.

Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism...")
Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup

2019-09-21T05:18:30+00:00

[ Upstream commit 17d8c5d145000070c581f2a8aa01edc7998582ab ]

Initialise the result count to 0 rather than initialising it to the
argument count. The reason is that we want to ensure we record the
I/O stats correctly in the case where an error is returned (for
instance in the layoutstats).

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFSv4: Fix return value in nfs_finish_open()

2019-09-21T05:18:30+00:00

[ Upstream commit 9821421a291b548ef4369c6998745baa36ddecd5 ]

If the file turns out to be of the wrong type after opening, we want
to revalidate the path and retry, so return EOPENSTALE rather than
ESTALE.

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin

NFSv4: Fix return values for nfs4_file_open()

2019-09-21T05:18:30+00:00

[ Upstream commit 90cf500e338ab3f3c0f126ba37e36fb6a9058441 ]

Currently, we are translating RPC level errors such as timeouts,
as well as interrupts etc into EOPENSTALE, which forces a single
replay of the open attempt. What we actually want to do is
force the replay only in the cases where the returned error
indicates that the file may have changed on the server.

So the fix is to spell out the exact set of errors where we want
to return EOPENSTALE.

Signed-off-by: Trond Myklebust 
Signed-off-by: Sasha Levin