git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
ocfs2
/
localalloc.h
diff --git
a/fs/ocfs2/localalloc.h
b/fs/ocfs2/localalloc.h
index
30f88ce
..
3f76631
100644
(file)
--- a/
fs/ocfs2/localalloc.h
+++ b/
fs/ocfs2/localalloc.h
@@
-42,14
+42,13
@@
int ocfs2_alloc_should_use_local(struct ocfs2_super *osb,
struct ocfs2_alloc_context;
int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
struct ocfs2_alloc_context;
int ocfs2_reserve_local_alloc_bits(struct ocfs2_super *osb,
- struct ocfs2_journal_handle *passed_handle,
u32 bits_wanted,
struct ocfs2_alloc_context *ac);
int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
u32 bits_wanted,
struct ocfs2_alloc_context *ac);
int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb,
-
struct ocfs2_journal_handle
*handle,
+
handle_t
*handle,
struct ocfs2_alloc_context *ac,
struct ocfs2_alloc_context *ac,
- u32
min_bits
,
+ u32
bits_wanted
,
u32 *bit_off,
u32 *num_bits);
u32 *bit_off,
u32 *num_bits);