Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index f3084cc..39e2dc0 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -253,7 +253,7 @@ EXPORT_SYMBOL(add_to_pipe);
  */
 int splice_grow_spd(const struct pipe_inode_info *pipe, struct splice_pipe_desc *spd)
 {
-       unsigned int buffers = ACCESS_ONCE(pipe->buffers);
+       unsigned int buffers = READ_ONCE(pipe->buffers);
 
        spd->nr_pages_max = buffers;
        if (buffers <= PIPE_DEF_BUFFERS)