From e5bf01af2e6116667cf615e02b7807113ca8d565 Mon Sep 17 00:00:00 2001
From: Coywolf Qi Hunt <qiyong@fc-cn.com>
Date: Tue, 6 Sep 2005 15:18:17 -0700
Subject: [PATCH] --- yaml --- r: 7428 b: refs/heads/master c:
 736c7b808f38f3bb72941345e11e236ec65dec3d h: refs/heads/master v: v3

---
 [refs]            |  2 +-
 trunk/fs/buffer.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8809082743f0..2719eacb48f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f4bb1f4199b7dc0c958447b1e4898980013b884
+refs/heads/master: 736c7b808f38f3bb72941345e11e236ec65dec3d
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 6a25d7df89b1..a92b81403552 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -3046,10 +3046,9 @@ struct buffer_head *alloc_buffer_head(unsigned int __nocast gfp_flags)
 {
 	struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags);
 	if (ret) {
-		preempt_disable();
-		__get_cpu_var(bh_accounting).nr++;
+		get_cpu_var(bh_accounting).nr++;
 		recalc_bh_state();
-		preempt_enable();
+		put_cpu_var(bh_accounting);
 	}
 	return ret;
 }
@@ -3059,10 +3058,9 @@ void free_buffer_head(struct buffer_head *bh)
 {
 	BUG_ON(!list_empty(&bh->b_assoc_buffers));
 	kmem_cache_free(bh_cachep, bh);
-	preempt_disable();
-	__get_cpu_var(bh_accounting).nr--;
+	get_cpu_var(bh_accounting).nr--;
 	recalc_bh_state();
-	preempt_enable();
+	put_cpu_var(bh_accounting);
 }
 EXPORT_SYMBOL(free_buffer_head);