projects/linux·commit 736c7b80

[PATCH] alloc_buffer_head() and free_buffer_head() cleanup

736c7b80 · Coywolf Qi Hunt <[email protected]> · 2005-09-06 15:18:17 -07:00

Signed-off-by: Coywolf Qi Hunt <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
736c7b808f38f3bb72941345e11e236ec65dec3d
Parents
3f4bb1f4

Changes

1 files changed · +4 −6

FileStatusAddDelContent
fs/buffer.cmodified+4−6View file

fs/buffer.c

View file
diff --git a/fs/buffer.c b/fs/buffer.c
index 6a25d7d..a92b814 100644
--- a/fs/buffer.c
+++ b/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);