diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-05-19 01:40:42 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-05-19 01:40:42 +0200 |
| commit | 41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1 (patch) | |
| tree | 89eddf2dffadbbd13939f94eb8cd904a26279390 /fs/ocfs2/localalloc.c | |
| parent | fs/ocfs2/dlm: Use kstrdup (diff) | |
| parent | ocfs2: enable discontig block group support. (diff) | |
| download | linux-41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1.tar.xz linux-41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1.zip | |
Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window
Diffstat (limited to 'fs/ocfs2/localalloc.c')
| -rw-r--r-- | fs/ocfs2/localalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index 63c41e206792..3d7419682dc0 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c @@ -122,7 +122,7 @@ unsigned int ocfs2_la_default_mb(struct ocfs2_super *osb) struct super_block *sb = osb->sb; gd_mb = ocfs2_clusters_to_megabytes(osb->sb, - 8 * ocfs2_group_bitmap_size(sb)); + 8 * ocfs2_group_bitmap_size(sb, 0, osb->s_feature_incompat)); /* * This takes care of files systems with very small group @@ -1161,7 +1161,7 @@ static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, /* we used the generic suballoc reserve function, but we set * everything up nicely, so there's no reason why we can't use * the more specific cluster api to claim bits. */ - status = ocfs2_claim_clusters(osb, handle, ac, osb->local_alloc_bits, + status = ocfs2_claim_clusters(handle, ac, osb->local_alloc_bits, &cluster_off, &cluster_count); if (status == -ENOSPC) { retry_enospc: @@ -1175,7 +1175,7 @@ retry_enospc: goto bail; ac->ac_bits_wanted = osb->local_alloc_default_bits; - status = ocfs2_claim_clusters(osb, handle, ac, + status = ocfs2_claim_clusters(handle, ac, osb->local_alloc_bits, &cluster_off, &cluster_count); |