Merge tag 'dma-mapping-5.9-1' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-microblaze.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index f96367a..63940a7 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -140,6 +140,7 @@ static int
 nfs_file_flush(struct file *file, fl_owner_t id)
 {
        struct inode    *inode = file_inode(file);
+       errseq_t since;
 
        dprintk("NFS: flush(%pD2)\n", file);
 
@@ -148,7 +149,9 @@ nfs_file_flush(struct file *file, fl_owner_t id)
                return 0;
 
        /* Flush writes to the server and return any errors */
-       return nfs_wb_all(inode);
+       since = filemap_sample_wb_err(file->f_mapping);
+       nfs_wb_all(inode);
+       return filemap_check_wb_err(file->f_mapping, since);
 }
 
 ssize_t
@@ -587,12 +590,14 @@ static const struct vm_operations_struct nfs_file_vm_ops = {
        .page_mkwrite = nfs_vm_page_mkwrite,
 };
 
-static int nfs_need_check_write(struct file *filp, struct inode *inode)
+static int nfs_need_check_write(struct file *filp, struct inode *inode,
+                               int error)
 {
        struct nfs_open_context *ctx;
 
        ctx = nfs_file_open_context(filp);
-       if (nfs_ctx_key_to_expire(ctx, inode))
+       if (nfs_error_is_fatal_on_server(error) ||
+           nfs_ctx_key_to_expire(ctx, inode))
                return 1;
        return 0;
 }
@@ -603,6 +608,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
        struct inode *inode = file_inode(file);
        unsigned long written = 0;
        ssize_t result;
+       errseq_t since;
+       int error;
 
        result = nfs_key_timeout_notify(file, inode);
        if (result)
@@ -627,6 +634,7 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
        if (iocb->ki_pos > i_size_read(inode))
                nfs_revalidate_mapping(inode, file->f_mapping);
 
+       since = filemap_sample_wb_err(file->f_mapping);
        nfs_start_io_write(inode);
        result = generic_write_checks(iocb, from);
        if (result > 0) {
@@ -645,7 +653,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
                goto out;
 
        /* Return error values */
-       if (nfs_need_check_write(file, inode)) {
+       error = filemap_check_wb_err(file->f_mapping, since);
+       if (nfs_need_check_write(file, inode, error)) {
                int err = nfs_wb_all(inode);
                if (err < 0)
                        result = err;