diff options
Diffstat (limited to 'fs/ocfs2/localalloc.c')
-rw-r--r-- | fs/ocfs2/localalloc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index 2ae567a7042b..698d79a74ef8 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c | |||
@@ -58,7 +58,7 @@ static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb, | |||
58 | static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc); | 58 | static void ocfs2_clear_local_alloc(struct ocfs2_dinode *alloc); |
59 | 59 | ||
60 | static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, | 60 | static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, |
61 | struct ocfs2_journal_handle *handle, | 61 | handle_t *handle, |
62 | struct ocfs2_dinode *alloc, | 62 | struct ocfs2_dinode *alloc, |
63 | struct inode *main_bm_inode, | 63 | struct inode *main_bm_inode, |
64 | struct buffer_head *main_bm_bh); | 64 | struct buffer_head *main_bm_bh); |
@@ -69,7 +69,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb, | |||
69 | struct buffer_head **bitmap_bh); | 69 | struct buffer_head **bitmap_bh); |
70 | 70 | ||
71 | static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, | 71 | static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, |
72 | struct ocfs2_journal_handle *handle, | 72 | handle_t *handle, |
73 | struct ocfs2_alloc_context *ac); | 73 | struct ocfs2_alloc_context *ac); |
74 | 74 | ||
75 | static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, | 75 | static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, |
@@ -195,7 +195,7 @@ bail: | |||
195 | void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) | 195 | void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) |
196 | { | 196 | { |
197 | int status; | 197 | int status; |
198 | struct ocfs2_journal_handle *handle; | 198 | handle_t *handle; |
199 | struct inode *local_alloc_inode = NULL; | 199 | struct inode *local_alloc_inode = NULL; |
200 | struct buffer_head *bh = NULL; | 200 | struct buffer_head *bh = NULL; |
201 | struct buffer_head *main_bm_bh = NULL; | 201 | struct buffer_head *main_bm_bh = NULL; |
@@ -382,7 +382,7 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb, | |||
382 | struct ocfs2_dinode *alloc) | 382 | struct ocfs2_dinode *alloc) |
383 | { | 383 | { |
384 | int status; | 384 | int status; |
385 | struct ocfs2_journal_handle *handle; | 385 | handle_t *handle; |
386 | struct buffer_head *main_bm_bh = NULL; | 386 | struct buffer_head *main_bm_bh = NULL; |
387 | struct inode *main_bm_inode; | 387 | struct inode *main_bm_inode; |
388 | 388 | ||
@@ -414,7 +414,7 @@ int ocfs2_complete_local_alloc_recovery(struct ocfs2_super *osb, | |||
414 | } | 414 | } |
415 | 415 | ||
416 | /* we want the bitmap change to be recorded on disk asap */ | 416 | /* we want the bitmap change to be recorded on disk asap */ |
417 | handle->k_handle->h_sync = 1; | 417 | handle->h_sync = 1; |
418 | 418 | ||
419 | status = ocfs2_sync_local_to_main(osb, handle, alloc, | 419 | status = ocfs2_sync_local_to_main(osb, handle, alloc, |
420 | main_bm_inode, main_bm_bh); | 420 | main_bm_inode, main_bm_bh); |
@@ -521,7 +521,7 @@ bail: | |||
521 | } | 521 | } |
522 | 522 | ||
523 | int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, | 523 | int ocfs2_claim_local_alloc_bits(struct ocfs2_super *osb, |
524 | struct ocfs2_journal_handle *handle, | 524 | handle_t *handle, |
525 | struct ocfs2_alloc_context *ac, | 525 | struct ocfs2_alloc_context *ac, |
526 | u32 min_bits, | 526 | u32 min_bits, |
527 | u32 *bit_off, | 527 | u32 *bit_off, |
@@ -699,7 +699,7 @@ static void ocfs2_verify_zero_bits(unsigned long *bitmap, | |||
699 | * passed is used for caching. | 699 | * passed is used for caching. |
700 | */ | 700 | */ |
701 | static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, | 701 | static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, |
702 | struct ocfs2_journal_handle *handle, | 702 | handle_t *handle, |
703 | struct ocfs2_dinode *alloc, | 703 | struct ocfs2_dinode *alloc, |
704 | struct inode *main_bm_inode, | 704 | struct inode *main_bm_inode, |
705 | struct buffer_head *main_bm_bh) | 705 | struct buffer_head *main_bm_bh) |
@@ -811,7 +811,7 @@ bail: | |||
811 | * pass it the bitmap lock in lock_bh if you have it. | 811 | * pass it the bitmap lock in lock_bh if you have it. |
812 | */ | 812 | */ |
813 | static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, | 813 | static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, |
814 | struct ocfs2_journal_handle *handle, | 814 | handle_t *handle, |
815 | struct ocfs2_alloc_context *ac) | 815 | struct ocfs2_alloc_context *ac) |
816 | { | 816 | { |
817 | int status = 0; | 817 | int status = 0; |
@@ -878,7 +878,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, | |||
878 | int status = 0; | 878 | int status = 0; |
879 | struct buffer_head *main_bm_bh = NULL; | 879 | struct buffer_head *main_bm_bh = NULL; |
880 | struct inode *main_bm_inode = NULL; | 880 | struct inode *main_bm_inode = NULL; |
881 | struct ocfs2_journal_handle *handle = NULL; | 881 | handle_t *handle = NULL; |
882 | struct ocfs2_dinode *alloc; | 882 | struct ocfs2_dinode *alloc; |
883 | struct ocfs2_dinode *alloc_copy = NULL; | 883 | struct ocfs2_dinode *alloc_copy = NULL; |
884 | struct ocfs2_alloc_context *ac = NULL; | 884 | struct ocfs2_alloc_context *ac = NULL; |