diff options
author | Paul Mackerras <paulus@samba.org> | 2007-10-03 15:33:17 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 15:33:17 +1000 |
commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /fs/ocfs2/localalloc.h | |
parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
download | linux-stable-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.tar.gz linux-stable-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.tar.bz2 linux-stable-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.zip |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'fs/ocfs2/localalloc.h')
-rw-r--r-- | fs/ocfs2/localalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/localalloc.h b/fs/ocfs2/localalloc.h index 385a10152f9c..3f76631e110c 100644 --- a/fs/ocfs2/localalloc.h +++ b/fs/ocfs2/localalloc.h @@ -48,7 +48,7 @@ int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb, int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, handle_t *handle, struct ocfs2_alloc_context *ac, - u32 min_bits, + u32 bits_wanted, u32 *bit_off, u32 *num_bits); |