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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-06-02 20:05:22 -0500 (Wed, 02 Jun 2004)
New Revision: 992

Modified:
   trunk/src/alloc.c
   trunk/src/file.c
   trunk/src/super.c
   trunk/src/sysfile.c
Log:
Remove unnecessary casts


Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-06-03 00:43:22 UTC (rev 991)
+++ trunk/src/alloc.c	2004-06-03 01:05:22 UTC (rev 992)
@@ -543,7 +543,7 @@
 
 	    case DISK_ALLOC_INODE:
 		    fileId = OCFS_INODE_BITMAP + NodeNum;
-		    blockSize = (__u32) osb->inode_size;
+		    blockSize = osb->inode_size;
 		    blockSizeBits = osb->inode_alloc_bits;
 		    break;
 
@@ -588,7 +588,7 @@
 		}
 		
 		foundBit = (__u32) (FreeLog->update[i].file_off >> blockSizeBits);
-		ocfs_clear_bits(handle, tmpbitmap, (__u32) foundBit,
+		ocfs_clear_bits(handle, tmpbitmap, foundBit,
 				(__u32) FreeLog->update[i].length);
 	}
 
@@ -719,12 +719,12 @@
 		ext->alloc_node = osb->node_num;
 		ext->extents[0].file_off = FileEntry->alloc_size;
 		ext->extents[0].num_bytes = actualLength;
-		ext->this_ext = (__u64) (physicalOffset + (osb->sect_size * i));
+		ext->this_ext = physicalOffset + (osb->sect_size * i);
 
 		if (i != depth) {
 			/* fill in each header */
 			ext->type = OCFS_EXTENT_HEADER;
-			ext->extents[0].disk_off = (__u64) (physicalOffset + (osb->sect_size * (i + 1)));
+			ext->extents[0].disk_off = physicalOffset + (osb->sect_size * (i + 1));
 			ext->granularity = (depth - 1 - i);
 			strcpy (ext->signature, OCFS_EXTENT_HEADER_SIGNATURE);
 		} else {
@@ -2877,7 +2877,7 @@
 		case DISK_ALLOC_INODE:
 			bm_file = OCFS_INODE_BITMAP + NodeNum;
 			alloc_file = OCFS_INODE_FILE + NodeNum;
-			blockSize = (__u32) osb->inode_size;
+			blockSize = osb->inode_size;
 			blockSizeBits = osb->inode_alloc_bits;
 			inode = igrab(osb->system_inodes[INODE_ALLOC_BITMAP_SYSTEM_INODE]);
 			break;
@@ -2943,8 +2943,7 @@
 
 		/* This function will check for clear bits in the Bitmap for */
 		/* consective clear bits equal to ClusterCount */
-		foundBit = ocfs_find_clear_bits (osb, &bitmap, 
-						 (__u32) numBits, 0, 0);
+		foundBit = ocfs_find_clear_bits (osb, &bitmap, numBits, 0, 0);
 	}
 
 	/* It returns -1 on failure , otherwise ByteOffset points at the */
@@ -3020,7 +3019,7 @@
 
 	LOG_TRACE_ARGS ("byte offset=%d\n", foundBit);
 
-	ocfs_set_bits (handle, &bitmap, (__u32) foundBit, (__u32) numBits);
+	ocfs_set_bits (handle, &bitmap, foundBit, numBits);
 
 	/* only write out what has changed... */
 	startbh = OCFS_GLOBAL_OFF_TO_CHUNK(foundBit);

Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-06-03 00:43:22 UTC (rev 991)
+++ trunk/src/file.c	2004-06-03 01:05:22 UTC (rev 992)
@@ -1213,8 +1213,7 @@
 		actualDiskOffset =
 		    (bitmapOffset << osb->cluster_size_bits) +
 		    osb->vol_layout.data_start_off;
-		actualLength =
-		    (__u64) (numClustersAlloc << osb->cluster_size_bits);
+		actualLength = numClustersAlloc << osb->cluster_size_bits;
 
 		OCFS_BH_PUT_DATA(bh);
 		fileEntry = NULL;

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-06-03 00:43:22 UTC (rev 991)
+++ trunk/src/super.c	2004-06-03 01:05:22 UTC (rev 992)
@@ -1428,9 +1428,9 @@
 
 	memcpy (vol_layout->mount_point, vdh->mount_point, strlen (vdh->mount_point));
 	vol_layout->serial_num = vdh->serial_num;
-	vol_layout->size = (__u64) (vdh->device_size);
+	vol_layout->size = vdh->device_size;
 	vol_layout->start_off = vdh->start_off;
-	vol_layout->bitmap_off = (__u64) vdh->bitmap_off;
+	vol_layout->bitmap_off = vdh->bitmap_off;
 	vol_layout->publ_sect_off = vdh->publ_off;
 	vol_layout->vote_sect_off = vdh->vote_off;
 	vol_layout->root_bitmap_off = vdh->root_bitmap_off;
@@ -1451,8 +1451,6 @@
 	vol_layout->uid = vdh->uid;
 	vol_layout->gid = vdh->gid;
 
-
-
 	memcpy (vol_layout->vol_id, vol_label->vol_id, MAX_VOL_ID_LENGTH);
 
 	if (vol_layout->dir_node_size == 0) 

Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c	2004-06-03 00:43:22 UTC (rev 991)
+++ trunk/src/sysfile.c	2004-06-03 01:05:22 UTC (rev 992)
@@ -216,8 +216,8 @@
 		goto leave;
 	}
 
-	*Length = (__u64) (fe->file_size);
-	*AllocSize = (__u64) (fe->alloc_size);
+	*Length = fe->file_size;
+	*AllocSize = fe->alloc_size;
 
 leave:
 	if (fe) {
@@ -298,8 +298,7 @@
 		actualDiskOffset =
 		    (BitmapOffset * osb->vol_layout.cluster_size) +
 		    osb->vol_layout.data_start_off;
-		actualLength =
-		    (__u64) (numClusterAlloc * osb->vol_layout.cluster_size);
+		actualLength = numClusterAlloc * osb->vol_layout.cluster_size;
 
 		status = ocfs_allocate_extent (osb, fe_bh, handle,  
 					       actualDiskOffset, actualLength, NULL);