diff options
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 100754de16b8..fe6b795b1a45 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -134,7 +134,7 @@ bail: | |||
134 | return (err < 0) ? -EIO : 0; | 134 | return (err < 0) ? -EIO : 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | int ocfs2_set_inode_size(struct ocfs2_journal_handle *handle, | 137 | int ocfs2_set_inode_size(handle_t *handle, |
138 | struct inode *inode, | 138 | struct inode *inode, |
139 | struct buffer_head *fe_bh, | 139 | struct buffer_head *fe_bh, |
140 | u64 new_i_size) | 140 | u64 new_i_size) |
@@ -163,7 +163,7 @@ static int ocfs2_simple_size_update(struct inode *inode, | |||
163 | { | 163 | { |
164 | int ret; | 164 | int ret; |
165 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | 165 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); |
166 | struct ocfs2_journal_handle *handle = NULL; | 166 | handle_t *handle = NULL; |
167 | 167 | ||
168 | handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); | 168 | handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); |
169 | if (handle == NULL) { | 169 | if (handle == NULL) { |
@@ -188,7 +188,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, | |||
188 | u64 new_i_size) | 188 | u64 new_i_size) |
189 | { | 189 | { |
190 | int status; | 190 | int status; |
191 | struct ocfs2_journal_handle *handle; | 191 | handle_t *handle; |
192 | 192 | ||
193 | mlog_entry_void(); | 193 | mlog_entry_void(); |
194 | 194 | ||
@@ -327,7 +327,7 @@ int ocfs2_do_extend_allocation(struct ocfs2_super *osb, | |||
327 | struct inode *inode, | 327 | struct inode *inode, |
328 | u32 clusters_to_add, | 328 | u32 clusters_to_add, |
329 | struct buffer_head *fe_bh, | 329 | struct buffer_head *fe_bh, |
330 | struct ocfs2_journal_handle *handle, | 330 | handle_t *handle, |
331 | struct ocfs2_alloc_context *data_ac, | 331 | struct ocfs2_alloc_context *data_ac, |
332 | struct ocfs2_alloc_context *meta_ac, | 332 | struct ocfs2_alloc_context *meta_ac, |
333 | enum ocfs2_alloc_restarted *reason_ret) | 333 | enum ocfs2_alloc_restarted *reason_ret) |
@@ -432,7 +432,7 @@ static int ocfs2_extend_allocation(struct inode *inode, | |||
432 | u32 prev_clusters; | 432 | u32 prev_clusters; |
433 | struct buffer_head *bh = NULL; | 433 | struct buffer_head *bh = NULL; |
434 | struct ocfs2_dinode *fe = NULL; | 434 | struct ocfs2_dinode *fe = NULL; |
435 | struct ocfs2_journal_handle *handle = NULL; | 435 | handle_t *handle = NULL; |
436 | struct ocfs2_alloc_context *data_ac = NULL; | 436 | struct ocfs2_alloc_context *data_ac = NULL; |
437 | struct ocfs2_alloc_context *meta_ac = NULL; | 437 | struct ocfs2_alloc_context *meta_ac = NULL; |
438 | enum ocfs2_alloc_restarted why; | 438 | enum ocfs2_alloc_restarted why; |
@@ -552,7 +552,7 @@ restarted_transaction: | |||
552 | credits = ocfs2_calc_extend_credits(osb->sb, | 552 | credits = ocfs2_calc_extend_credits(osb->sb, |
553 | fe, | 553 | fe, |
554 | clusters_to_add); | 554 | clusters_to_add); |
555 | status = ocfs2_extend_trans(handle->k_handle, credits); | 555 | status = ocfs2_extend_trans(handle, credits); |
556 | if (status < 0) { | 556 | if (status < 0) { |
557 | /* handle still has to be committed at | 557 | /* handle still has to be committed at |
558 | * this point. */ | 558 | * this point. */ |
@@ -610,7 +610,7 @@ static int ocfs2_write_zero_page(struct inode *inode, | |||
610 | struct page *page; | 610 | struct page *page; |
611 | unsigned long index; | 611 | unsigned long index; |
612 | unsigned int offset; | 612 | unsigned int offset; |
613 | struct ocfs2_journal_handle *handle = NULL; | 613 | handle_t *handle = NULL; |
614 | int ret; | 614 | int ret; |
615 | 615 | ||
616 | offset = (size & (PAGE_CACHE_SIZE-1)); /* Within page */ | 616 | offset = (size & (PAGE_CACHE_SIZE-1)); /* Within page */ |
@@ -775,7 +775,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) | |||
775 | struct super_block *sb = inode->i_sb; | 775 | struct super_block *sb = inode->i_sb; |
776 | struct ocfs2_super *osb = OCFS2_SB(sb); | 776 | struct ocfs2_super *osb = OCFS2_SB(sb); |
777 | struct buffer_head *bh = NULL; | 777 | struct buffer_head *bh = NULL; |
778 | struct ocfs2_journal_handle *handle = NULL; | 778 | handle_t *handle = NULL; |
779 | 779 | ||
780 | mlog_entry("(0x%p, '%.*s')\n", dentry, | 780 | mlog_entry("(0x%p, '%.*s')\n", dentry, |
781 | dentry->d_name.len, dentry->d_name.name); | 781 | dentry->d_name.len, dentry->d_name.name); |
@@ -897,7 +897,7 @@ static int ocfs2_write_remove_suid(struct inode *inode) | |||
897 | int ret; | 897 | int ret; |
898 | struct buffer_head *bh = NULL; | 898 | struct buffer_head *bh = NULL; |
899 | struct ocfs2_inode_info *oi = OCFS2_I(inode); | 899 | struct ocfs2_inode_info *oi = OCFS2_I(inode); |
900 | struct ocfs2_journal_handle *handle; | 900 | handle_t *handle; |
901 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | 901 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); |
902 | struct ocfs2_dinode *di; | 902 | struct ocfs2_dinode *di; |
903 | 903 | ||