io_uring: kill sqo_dead and sqo submission halting

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

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 63940a7..16ad505 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -89,7 +89,7 @@ nfs_file_release(struct inode *inode, struct file *filp)
 EXPORT_SYMBOL_GPL(nfs_file_release);
 
 /**
- * nfs_revalidate_size - Revalidate the file size
+ * nfs_revalidate_file_size - Revalidate the file size
  * @inode: pointer to inode struct
  * @filp: pointer to struct file
  *
@@ -606,8 +606,8 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
 {
        struct file *file = iocb->ki_filp;
        struct inode *inode = file_inode(file);
-       unsigned long written = 0;
-       ssize_t result;
+       unsigned int mntflags = NFS_SERVER(inode)->flags;
+       ssize_t result, written;
        errseq_t since;
        int error;
 
@@ -626,13 +626,13 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
        /*
         * O_APPEND implies that we must revalidate the file length.
         */
-       if (iocb->ki_flags & IOCB_APPEND) {
+       if (iocb->ki_flags & IOCB_APPEND || iocb->ki_pos > i_size_read(inode)) {
                result = nfs_revalidate_file_size(inode, file);
                if (result)
                        goto out;
        }
-       if (iocb->ki_pos > i_size_read(inode))
-               nfs_revalidate_mapping(inode, file->f_mapping);
+
+       nfs_clear_invalid_mapping(file->f_mapping);
 
        since = filemap_sample_wb_err(file->f_mapping);
        nfs_start_io_write(inode);
@@ -648,6 +648,21 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
 
        written = result;
        iocb->ki_pos += written;
+
+       if (mntflags & NFS_MOUNT_WRITE_EAGER) {
+               result = filemap_fdatawrite_range(file->f_mapping,
+                                                 iocb->ki_pos - written,
+                                                 iocb->ki_pos - 1);
+               if (result < 0)
+                       goto out;
+       }
+       if (mntflags & NFS_MOUNT_WRITE_WAIT) {
+               result = filemap_fdatawait_range(file->f_mapping,
+                                                iocb->ki_pos - written,
+                                                iocb->ki_pos - 1);
+               if (result < 0)
+                       goto out;
+       }
        result = generic_write_sync(iocb, written);
        if (result < 0)
                goto out;