Merge tag 'for-linus-5.19-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / ntfs3 / inode.c

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 74f60c4..be4ebdd 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -758,6 +758,7 @@ static ssize_t ntfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
        loff_t vbo = iocb->ki_pos;
        loff_t end;
        int wr = iov_iter_rw(iter) & WRITE;
+       size_t iter_count = iov_iter_count(iter);
        loff_t valid;
        ssize_t ret;
 
@@ -771,10 +772,13 @@ static ssize_t ntfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
                                 wr ? ntfs_get_block_direct_IO_W
                                    : ntfs_get_block_direct_IO_R);
 
-       if (ret <= 0)
+       if (ret > 0)
+               end = vbo + ret;
+       else if (wr && ret == -EIOCBQUEUED)
+               end = vbo + iter_count;
+       else
                goto out;
 
-       end = vbo + ret;
        valid = ni->i_valid;
        if (wr) {
                if (end > valid && !S_ISBLK(inode->i_mode)) {
@@ -1950,6 +1954,7 @@ const struct address_space_operations ntfs_aops = {
        .direct_IO      = ntfs_direct_IO,
        .bmap           = ntfs_bmap,
        .dirty_folio    = block_dirty_folio,
+       .invalidate_folio = block_invalidate_folio,
 };
 
 const struct address_space_operations ntfs_aops_cmpr = {