diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /fs/buffer.c | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 6cbfceabd95d..1216c0d3c8ce 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -3045,7 +3045,7 @@ static void recalc_bh_state(void) | |||
| 3045 | buffer_heads_over_limit = (tot > max_buffer_heads); | 3045 | buffer_heads_over_limit = (tot > max_buffer_heads); |
| 3046 | } | 3046 | } |
| 3047 | 3047 | ||
| 3048 | struct buffer_head *alloc_buffer_head(unsigned int __nocast gfp_flags) | 3048 | struct buffer_head *alloc_buffer_head(gfp_t gfp_flags) |
| 3049 | { | 3049 | { |
| 3050 | struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags); | 3050 | struct buffer_head *ret = kmem_cache_alloc(bh_cachep, gfp_flags); |
| 3051 | if (ret) { | 3051 | if (ret) { |