NFS: Do not report flush errors in nfs_write_end()

[ Upstream commit d95b26650e86175e4a97698d89bc1626cd1df0c6 ]

If we do flush cached writebacks in nfs_write_end() due to the imminent
expiration of an RPCSEC_GSS session, then we should defer reporting any
resulting errors until the calls to file_check_and_advance_wb_err() in
nfs_file_write() and nfs_file_fsync().

Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 1b66362696e07bf7cdb339c79212591663c0c026..a8693cc50c7cadef9fac1a784afb0e50ad0c7cde 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -390,11 +390,8 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
                return status;
        NFS_I(mapping->host)->write_io += copied;
 
-       if (nfs_ctx_key_to_expire(ctx, mapping->host)) {
-               status = nfs_wb_all(mapping->host);
-               if (status < 0)
-                       return status;
-       }
+       if (nfs_ctx_key_to_expire(ctx, mapping->host))
+               nfs_wb_all(mapping->host);
 
        return copied;
 }