diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2022-05-14 17:27:03 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-14 19:11:43 +0300 |
| commit | 55f0fc32b2f22b2b6b5f9ab076490792e8d8ce5d (patch) | |
| tree | 026f5e43e49d763cebd2a7a31a42dd46192b2e50 /fs | |
| parent | 59137943af756cd721d16f46a3124901477a8ad2 (diff) | |
| download | linux-55f0fc32b2f22b2b6b5f9ab076490792e8d8ce5d.tar.xz | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 73415970af38..3233da79d49a 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -394,11 +394,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; } |