[Ocfs2-commits] manish commits r1054 - branches/format-changes/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-11 16:22:09 -0500 (Fri, 11 Jun 2004)
New Revision: 1054

Modified:
   branches/format-changes/src/super.c
Log:
Always initialize freebits to something sane in ocfs_statfs


Modified: branches/format-changes/src/super.c
===================================================================
--- branches/format-changes/src/super.c	2004-06-11 21:07:06 UTC (rev 1053)
+++ branches/format-changes/src/super.c	2004-06-11 21:22:09 UTC (rev 1054)
@@ -695,7 +695,7 @@
 #endif
 {
 	ocfs_super *osb = NULL;
-	__u32 numbits, freebits = 0;
+	__u32 numbits, freebits;
 	unsigned int reserved_bits;
 	int status = 0;
 	ocfs2_dinode *bm_lock = NULL;
@@ -704,16 +704,18 @@
 	LOG_ENTRY_ARGS ("(%p, %p)\n", sb, buf);
 
 	osb = OCFS_SB(sb);
-	numbits = osb->cluster_bitmap.validbits;
  
 	status = ocfs_read_bh (osb, OCFS_BITMAP_LOCK_OFFSET(osb), &bh, 0, NULL);
 	if (status < 0) {
 		LOG_ERROR_STR("failed to read bitmap data");
 		return -EIO;
 	}
+
 	bm_lock = OCFS_BH_GET_DATA_READ(bh);
+
+	freebits = numbits = osb->cluster_bitmap.validbits;
 	if (numbits >= bm_lock->u.i_bitinfo.b_used)
-	    freebits = numbits - bm_lock->u.i_bitinfo.b_used;
+	    freebits -= bm_lock->u.i_bitinfo.b_used;
 
 	/* take out the space reserved for system files */
 	reserved_bits = ocfs_clusters_for_bytes(sb, 8 * ONE_MEGA_BYTE);