From bba27a3b1e483f59759488368b5e1bb1b527f7da Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Tue, 2 May 2006 17:54:45 -0700 Subject: [PATCH] --- yaml --- r: 33363 b: refs/heads/master c: 101ebf256de54e78e6d3277adacf656e125a2c5a h: refs/heads/master i: 33361: e38d0c36fefd82910da59ad122df3e137ac13721 33359: 1c1fc2a8d1d8c44657965ed6701b8d1955ef78d2 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/ocfs2.h | 1 - trunk/fs/ocfs2/super.c | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e9178fb481a7..531a1a2a9654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9acd72f4240429dfd762c9a2c7eb5c18b5d32529 +refs/heads/master: 101ebf256de54e78e6d3277adacf656e125a2c5a diff --git a/trunk/fs/ocfs2/ocfs2.h b/trunk/fs/ocfs2/ocfs2.h index cd4a6f253d13..d52100d49b6c 100644 --- a/trunk/fs/ocfs2/ocfs2.h +++ b/trunk/fs/ocfs2/ocfs2.h @@ -197,7 +197,6 @@ struct ocfs2_super struct ocfs2_node_map recovery_map; struct ocfs2_node_map umount_map; - u32 num_clusters; u64 root_blkno; u64 system_dir_blkno; u64 bitmap_blkno; diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c index 382706a67ffd..d17e33e66a1e 100644 --- a/trunk/fs/ocfs2/super.c +++ b/trunk/fs/ocfs2/super.c @@ -1442,8 +1442,13 @@ 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, - inode); + NULL); iput(inode); if (status < 0) { mlog_errno(status); @@ -1452,7 +1457,6 @@ static int ocfs2_initialize_super(struct super_block *sb, di = (struct ocfs2_dinode *) bitmap_bh->b_data; osb->bitmap_cpg = le16_to_cpu(di->id2.i_chain.cl_cpg); - osb->num_clusters = le32_to_cpu(di->id1.bitmap1.i_total); brelse(bitmap_bh); mlog(0, "cluster bitmap inode: %llu, clusters per group: %u\n", (unsigned long long)osb->bitmap_blkno, osb->bitmap_cpg);