selftests/seccomp: More closely track fds being assigned

[linux-2.6-microblaze.git] / fs / iomap / direct-io.c

diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index bdd0d89..9398b8c 100644 (file)
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -487,12 +487,28 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                if (pos >= dio->i_size)
                        goto out_free_dio;
 
+               if (iocb->ki_flags & IOCB_NOWAIT) {
+                       if (filemap_range_needs_writeback(mapping, pos, end)) {
+                               ret = -EAGAIN;
+                               goto out_free_dio;
+                       }
+                       iomap_flags |= IOMAP_NOWAIT;
+               }
+
                if (iter_is_iovec(iter))
                        dio->flags |= IOMAP_DIO_DIRTY;
        } else {
                iomap_flags |= IOMAP_WRITE;
                dio->flags |= IOMAP_DIO_WRITE;
 
+               if (iocb->ki_flags & IOCB_NOWAIT) {
+                       if (filemap_range_has_page(mapping, pos, end)) {
+                               ret = -EAGAIN;
+                               goto out_free_dio;
+                       }
+                       iomap_flags |= IOMAP_NOWAIT;
+               }
+
                /* for data sync or sync, we need sync completion processing */
                if (iocb->ki_flags & IOCB_DSYNC)
                        dio->flags |= IOMAP_DIO_NEED_SYNC;
@@ -507,14 +523,6 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                        dio->flags |= IOMAP_DIO_WRITE_FUA;
        }
 
-       if (iocb->ki_flags & IOCB_NOWAIT) {
-               if (filemap_range_has_page(mapping, pos, end)) {
-                       ret = -EAGAIN;
-                       goto out_free_dio;
-               }
-               iomap_flags |= IOMAP_NOWAIT;
-       }
-
        if (dio_flags & IOMAP_DIO_OVERWRITE_ONLY) {
                ret = -EAGAIN;
                if (pos >= dio->i_size || pos + count > dio->i_size)