diff options
Diffstat (limited to 'fs/ocfs2/localalloc.c')
| -rw-r--r-- | fs/ocfs2/localalloc.c | 10 | 
1 files changed, 6 insertions, 4 deletions
| diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index ca992d91f511..c983715d8d8c 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c | |||
| @@ -872,8 +872,10 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, | |||
| 872 | (unsigned long long)la_start_blk, | 872 | (unsigned long long)la_start_blk, | 
| 873 | (unsigned long long)blkno); | 873 | (unsigned long long)blkno); | 
| 874 | 874 | ||
| 875 | status = ocfs2_free_clusters(handle, main_bm_inode, | 875 | status = ocfs2_release_clusters(handle, | 
| 876 | main_bm_bh, blkno, count); | 876 | main_bm_inode, | 
| 877 | main_bm_bh, blkno, | ||
| 878 | count); | ||
| 877 | if (status < 0) { | 879 | if (status < 0) { | 
| 878 | mlog_errno(status); | 880 | mlog_errno(status); | 
| 879 | goto bail; | 881 | goto bail; | 
| @@ -984,8 +986,7 @@ static int ocfs2_local_alloc_reserve_for_window(struct ocfs2_super *osb, | |||
| 984 | } | 986 | } | 
| 985 | 987 | ||
| 986 | retry_enospc: | 988 | retry_enospc: | 
| 987 | (*ac)->ac_bits_wanted = osb->local_alloc_bits; | 989 | (*ac)->ac_bits_wanted = osb->local_alloc_default_bits; | 
| 988 | |||
| 989 | status = ocfs2_reserve_cluster_bitmap_bits(osb, *ac); | 990 | status = ocfs2_reserve_cluster_bitmap_bits(osb, *ac); | 
| 990 | if (status == -ENOSPC) { | 991 | if (status == -ENOSPC) { | 
| 991 | if (ocfs2_recalc_la_window(osb, OCFS2_LA_EVENT_ENOSPC) == | 992 | if (ocfs2_recalc_la_window(osb, OCFS2_LA_EVENT_ENOSPC) == | 
| @@ -1061,6 +1062,7 @@ retry_enospc: | |||
| 1061 | OCFS2_LA_DISABLED) | 1062 | OCFS2_LA_DISABLED) | 
| 1062 | goto bail; | 1063 | goto bail; | 
| 1063 | 1064 | ||
| 1065 | ac->ac_bits_wanted = osb->local_alloc_default_bits; | ||
| 1064 | status = ocfs2_claim_clusters(osb, handle, ac, | 1066 | status = ocfs2_claim_clusters(osb, handle, ac, | 
| 1065 | osb->local_alloc_bits, | 1067 | osb->local_alloc_bits, | 
| 1066 | &cluster_off, | 1068 | &cluster_off, | 
