From d8d287e082658322d6bf0e178536b3061260d9c2 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Mon, 9 Aug 2010 17:18:42 -0700 Subject: [PATCH] --- yaml --- r: 207201 b: refs/heads/master c: a9877cc2937889e5669114f28612b494384152a4 h: refs/heads/master i: 207199: b8e849a3885753eb501d242d18a6644156991207 v: v3 --- [refs] | 2 +- trunk/include/linux/buffer_head.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8630155d514d..0f3cef5d0119 100644 --- 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 index 1b9ba193b789..2ce51fac7d3d 100644 --- 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); }