Merge tag 'gfs2-4.15.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2...

[linux-2.6-microblaze.git] / fs / aio.c

diff --git a/fs/aio.c b/fs/aio.c
index 5a24872..e6de771 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -576,7 +576,7 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
         * actually has a cancel function, hence the cmpxchg()
         */
 
-       cancel = ACCESS_ONCE(kiocb->ki_cancel);
+       cancel = READ_ONCE(kiocb->ki_cancel);
        do {
                if (!cancel || cancel == KIOCB_CANCELLED)
                        return -EINVAL;