|
@@ -1280,7 +1280,6 @@ static int ocfs2_initialize_super(struct super_block *sb,
|
|
|
int i, cbits, bbits;
|
|
|
struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;
|
|
|
struct inode *inode = NULL;
|
|
|
- struct buffer_head *bitmap_bh = NULL;
|
|
|
struct ocfs2_journal *journal;
|
|
|
__le32 uuid_net_key;
|
|
|
struct ocfs2_super *osb;
|
|
@@ -1497,25 +1496,9 @@ static int ocfs2_initialize_super(struct super_block *sb,
|
|
|
}
|
|
|
|
|
|
osb->bitmap_blkno = OCFS2_I(inode)->ip_blkno;
|
|
|
-
|
|
|
- /* We don't have a cluster lock on the bitmap here because
|
|
|
- * we're only interested in static information and the extra
|
|
|
- * complexity at mount time isn't worht it. Don't pass the
|
|
|
- * inode in to the read function though as we don't want it to
|
|
|
- * be put in the cache. */
|
|
|
- status = ocfs2_read_block(osb, osb->bitmap_blkno, &bitmap_bh, 0,
|
|
|
- NULL);
|
|
|
iput(inode);
|
|
|
- if (status < 0) {
|
|
|
- mlog_errno(status);
|
|
|
- goto bail;
|
|
|
- }
|
|
|
|
|
|
- di = (struct ocfs2_dinode *) bitmap_bh->b_data;
|
|
|
- osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg);
|
|
|
- brelse(bitmap_bh);
|
|
|
- mlog(0, "cluster bitmap inode: %llu, clusters per group: %u\n",
|
|
|
- (unsigned long long)osb->bitmap_blkno, osb->bitmap_cpg);
|
|
|
+ osb->bitmap_cpg = ocfs2_group_bitmap_size(sb) * 8;
|
|
|
|
|
|
status = ocfs2_init_slot_info(osb);
|
|
|
if (status < 0) {
|