---

yaml --- r: 139729 b: refs/heads/master c: 2c53d91 h: refs/heads/master i: 139727: 250af09 v: v3
git-mirror · Apr 3, 2009 · 6beddfe · 6beddfe
1 parent 30f0678
commit 6beddfe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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);