[Ocfs2-commits] manish commits r985 - trunk/src

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-02 19:20:21 -0500 (Wed, 02 Jun 2004)
New Revision: 985

Modified:
   trunk/src/extmap.c
   trunk/src/super.c
Log:
Clean up unnecessary casts


Modified: trunk/src/extmap.c
===================================================================
--- trunk/src/extmap.c	2004-06-03 00:08:09 UTC (rev 984)
+++ trunk/src/extmap.c	2004-06-03 00:20:21 UTC (rev 985)
@@ -455,8 +455,7 @@
 
 	Vbo >>= osb->sect_size_bits;
 
-	ocfs_extent_map_remove ((ocfs_extent_map *) Map, (__s64) Vbo,
-			     (__s64) ByteCount);
+	ocfs_extent_map_remove (Map, Vbo, (__s64) ByteCount);
 
 	LOG_EXIT ();
 	return;
@@ -590,7 +589,7 @@
 	LOG_ENTRY ();
 
 	if (Flag == LOCAL_EXT) {
-		FileEntry = (ocfs_file_entry *) Buffer;
+		FileEntry = Buffer;
 
 		OCFS_ASSERT (FileEntry->local_ext);
 
@@ -612,7 +611,7 @@
 	} else {
 		__u64 localLength = 0;
 
-		OcfsExtent = (ocfs_extent_group *) Buffer;
+		OcfsExtent = Buffer;
 
 		for (j = 0; j < OcfsExtent->next_free_ext; j++) {
 			if ((__s64) (OcfsExtent->extents[j].file_off +

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-06-03 00:08:09 UTC (rev 984)
+++ trunk/src/super.c	2004-06-03 00:20:21 UTC (rev 985)
@@ -760,7 +760,7 @@
 		LOG_ERROR_STR("failed to read bitmap data");
 		return -EIO;
 	}
-	bm_lock = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+	bm_lock = OCFS_BH_GET_DATA_READ(bh);
 	if (numbits >= bm_lock->u.bitinfo.used_bits)
 	    freebits = numbits - bm_lock->u.bitinfo.used_bits;
 
@@ -882,8 +882,8 @@
 	for (i=0; i<2; i++)
 		wait_on_buffer(bhs[i]);
 
-	vol_header = (ocfs_vol_disk_hdr *) OCFS_BH_GET_DATA_READ(bhs[0]); /* read */
-	vol_label = (ocfs_vol_label *) OCFS_BH_GET_DATA_READ(bhs[1]); /* read */
+	vol_header = OCFS_BH_GET_DATA_READ(bhs[0]);
+	vol_label = OCFS_BH_GET_DATA_READ(bhs[1]);
 
 	LOG_TRACE_STR ("ocfs_verify_volume...");
 	status = ocfs_verify_volume (vol_header);
@@ -1020,7 +1020,7 @@
 	}
 
 	/* Launch the commit thread */
-	osb->commit = (ocfs_commit_task *)ocfs_malloc(sizeof(ocfs_commit_task));
+	osb->commit = ocfs_malloc(sizeof(ocfs_commit_task));
 	if (osb->commit == NULL) {
 		LOG_ERROR_STATUS(status = -ENOMEM);
 		up (&(osb->osb_res));
@@ -1241,7 +1241,7 @@
 		LOG_ERROR_STATUS (status);
 		goto done;
 	}
-	publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(publish_bh); /* read */
+	publish = OCFS_BH_GET_DATA_READ(publish_bh);
 
 	retval = publish->mounted;
 
@@ -1269,7 +1269,7 @@
 		LOG_ERROR_STATUS (status);
 		goto done;
 	}
-	publish = (ocfs_publish *) OCFS_BH_GET_DATA_WRITE(publish_bh); /* write */
+	publish = OCFS_BH_GET_DATA_WRITE(publish_bh);
 
 	/* change it */
 	publish->mounted = value;
@@ -1518,7 +1518,7 @@
 		LOG_ERROR_STATUS (status);
 		goto finally;
 	}
-	publish = (ocfs_publish *) OCFS_BH_GET_DATA_WRITE(publish_bh); /* write */
+	publish = OCFS_BH_GET_DATA_WRITE(publish_bh);
 
 	publish->time = ocfs_get_publish_time();
 
@@ -1673,7 +1673,7 @@
 		goto finally;
 	}
 	
-	publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(publish_bh); /* read */
+	publish = OCFS_BH_GET_DATA_READ(publish_bh);
 	/* we copy this out of the publish sector and then unlock
 	 * the bh as other functions will need to modify it. */
 	mounted = publish->mounted;