diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-05-18 19:40:42 -0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-05-18 19:40:42 -0400 |
| commit | 41841b0bcea8af7f3bff8b2a23d542b94d9c1bb1 (patch) | |
| tree | 89eddf2dffadbbd13939f94eb8cd904a26279390 /fs/ocfs2/super.c | |
| parent | 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd (diff) | |
| parent | 1a934c3e57594588c373aea858e4593cdfcba4f4 (diff) | |
Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window
Diffstat (limited to 'fs/ocfs2/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index cf6d87b57450..1c2c39f6f0b6 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
| @@ -2277,7 +2277,8 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
| 2277 | osb->osb_clusters_at_boot = OCFS2_I(inode)->ip_clusters; | 2277 | osb->osb_clusters_at_boot = OCFS2_I(inode)->ip_clusters; |
| 2278 | iput(inode); | 2278 | iput(inode); |
| 2279 | 2279 | ||
| 2280 | osb->bitmap_cpg = ocfs2_group_bitmap_size(sb) * 8; | 2280 | osb->bitmap_cpg = ocfs2_group_bitmap_size(sb, 0, |
| 2281 | osb->s_feature_incompat) * 8; | ||
| 2281 | 2282 | ||
| 2282 | status = ocfs2_init_slot_info(osb); | 2283 | status = ocfs2_init_slot_info(osb); |
| 2283 | if (status < 0) { | 2284 | if (status < 0) { |