---

yaml --- r: 207201 b: refs/heads/master c: a9877cc h: refs/heads/master i: 207199: b8e849a v: v3
git-mirror · Aug 10, 2010 · d8d287e · d8d287e
1 parent 8d56a0a
commit d8d287e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76545066c8521f3e32c849744744842b4df25b79
+refs/heads/master: a9877cc2937889e5669114f28612b494384152a4
diff --git a/trunk/include/linux/buffer_head.h b/trunk/include/linux/buffer_head.h
@@ -314,15 +314,10 @@ map_bh(struct buffer_head *bh, struct super_block *sb, sector_t block)
 	bh->b_size = sb->s_blocksize;
 }
 
-/*
- * Calling wait_on_buffer() for a zero-ref buffer is illegal, so we call into
- * __wait_on_buffer() just to trip a debug check.  Because debug code in inline
- * functions is bloaty.
- */
 static inline void wait_on_buffer(struct buffer_head *bh)
 {
 	might_sleep();
-	if (buffer_locked(bh) || atomic_read(&bh->b_count) == 0)
+	if (buffer_locked(bh))
 		__wait_on_buffer(bh);
 }