---

yaml --- r: 286694 b: refs/heads/master c: 8cfd14a h: refs/heads/master v: v3
git-mirror · Jan 22, 2012 · 374af31 · 374af31
1 parent d3cdaf7
commit 374af31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 376be5ff8a6a36efadd131860cf26841f366d44c
+refs/heads/master: 8cfd14ad1eb52e44cb1fe7b47a68126e45e04026
diff --git a/trunk/include/linux/res_counter.h b/trunk/include/linux/res_counter.h
@@ -142,7 +142,10 @@ static inline unsigned long long res_counter_margin(struct res_counter *cnt)
 	unsigned long flags;
 
 	spin_lock_irqsave(&cnt->lock, flags);
-	margin = cnt->limit - cnt->usage;
+	if (cnt->limit > cnt->usage)
+		margin = cnt->limit - cnt->usage;
+	else
+		margin = 0;
 	spin_unlock_irqrestore(&cnt->lock, flags);
 	return margin;
 }