From 6beddfee4671966c9af260332bcf3a1b0656266c Mon Sep 17 00:00:00 2001 From: Aravind Srinivasan Date: Thu, 2 Apr 2009 16:58:59 -0700 Subject: [PATCH] --- yaml --- r: 139729 b: refs/heads/master c: 2c53d9109f077900e140edb8b766132ad93b81cc h: refs/heads/master i: 139727: 250af0997c71a4e45e07a35321fcd0db1c7a61c0 v: v3 --- [refs] | 2 +- trunk/kernel/relay.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6c1a1341c678..1cf2a21b34a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edb79a213223488735fae1d408f4c136e9ed25d6 +refs/heads/master: 2c53d9109f077900e140edb8b766132ad93b81cc diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index 8f2179c8056f..e92db8c06acf 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -797,13 +797,15 @@ void relay_subbufs_consumed(struct rchan *chan, if (!chan) return; - if (cpu >= NR_CPUS || !chan->buf[cpu]) + if (cpu >= NR_CPUS || !chan->buf[cpu] || + subbufs_consumed > chan->n_subbufs) return; buf = chan->buf[cpu]; - buf->subbufs_consumed += subbufs_consumed; - if (buf->subbufs_consumed > buf->subbufs_produced) + if (subbufs_consumed > buf->subbufs_produced - buf->subbufs_consumed) buf->subbufs_consumed = buf->subbufs_produced; + else + buf->subbufs_consumed += subbufs_consumed; } EXPORT_SYMBOL_GPL(relay_subbufs_consumed);