From 97605dd1590cd4cd76e7531414c1291027aeacd4 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Tue, 18 Dec 2007 15:46:10 +0800
Subject: [PATCH] --- yaml --- r: 76943 b: refs/heads/master c:
 e9d578a8f279d5e7d1e903f436aefc76ba330b43 h: refs/heads/master i:   76941:
 5871ad07654193d3339ccd429ee3b7bfa5be0b10   76939:
 b91b401c23abe754b2aee0e5f38e00035ab92ae8   76935:
 ccb10ed513b1cc8c944138963552233352df7b62   76927:
 ce8e0654dfa649634b6f22d34cbc91a44a15c02d v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ocfs2/super.c | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 5f25d2123993..454c360a0100 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1252c434e39dc60ca9e8ed682f3e04930e2c08de
+refs/heads/master: e9d578a8f279d5e7d1e903f436aefc76ba330b43
diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c
index 7708df36e223..479ac50c86d9 100644
--- a/trunk/fs/ocfs2/super.c
+++ b/trunk/fs/ocfs2/super.c
@@ -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) {