diff options
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 7708df36e223..479ac50c86d9 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -1280,7 +1280,6 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
1280 | int i, cbits, bbits; | 1280 | int i, cbits, bbits; |
1281 | struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data; | 1281 | struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data; |
1282 | struct inode *inode = NULL; | 1282 | struct inode *inode = NULL; |
1283 | struct buffer_head *bitmap_bh = NULL; | ||
1284 | struct ocfs2_journal *journal; | 1283 | struct ocfs2_journal *journal; |
1285 | __le32 uuid_net_key; | 1284 | __le32 uuid_net_key; |
1286 | struct ocfs2_super *osb; | 1285 | struct ocfs2_super *osb; |
@@ -1497,25 +1496,9 @@ static int ocfs2_initialize_super(struct super_block *sb, | |||
1497 | } | 1496 | } |
1498 | 1497 | ||
1499 | osb->bitmap_blkno = OCFS2_I(inode)->ip_blkno; | 1498 | osb->bitmap_blkno = OCFS2_I(inode)->ip_blkno; |
1500 | |||
1501 | /* We don't have a cluster lock on the bitmap here because | ||
1502 | * we're only interested in static information and the extra | ||
1503 | * complexity at mount time isn't worht it. Don't pass the | ||
1504 | * inode in to the read function though as we don't want it to | ||
1505 | * be put in the cache. */ | ||
1506 | status = ocfs2_read_block(osb, osb->bitmap_blkno, &bitmap_bh, 0, | ||
1507 | NULL); | ||
1508 | iput(inode); | 1499 | iput(inode); |
1509 | if (status < 0) { | ||
1510 | mlog_errno(status); | ||
1511 | goto bail; | ||
1512 | } | ||
1513 | 1500 | ||
1514 | di = (struct ocfs2_dinode *) bitmap_bh->b_data; | 1501 | osb->bitmap_cpg = ocfs2_group_bitmap_size(sb) * 8; |
1515 | osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg); | ||
1516 | brelse(bitmap_bh); | ||
1517 | mlog(0, "cluster bitmap inode: %llu, clusters per group: %u\n", | ||
1518 | (unsigned long long)osb->bitmap_blkno, osb->bitmap_cpg); | ||
1519 | 1502 | ||
1520 | status = ocfs2_init_slot_info(osb); | 1503 | status = ocfs2_init_slot_info(osb); |
1521 | if (status < 0) { | 1504 | if (status < 0) { |