Merge tag 'ceph-for-4.10-rc1' of git://github.com/ceph/ceph-client

[mirror_ubuntu-zesty-kernel.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index da79a109dbebc6f7d4cf725182b05365a946614b..8f18d314a96a49a1e9fc6c4cf1c5bead5c96a787 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -809,11 +809,11 @@ void relay_subbufs_consumed(struct rchan *chan,
 {
        struct rchan_buf *buf;
 
-       if (!chan)
+       if (!chan || cpu >= NR_CPUS)
                return;
 
        buf = *per_cpu_ptr(chan->buf, cpu);
-       if (cpu >= NR_CPUS || !buf || subbufs_consumed > chan->n_subbufs)
+       if (!buf || subbufs_consumed > chan->n_subbufs)
                return;
 
        if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed)