[Ocfs2-commits] jlbec commits r1013 - branches/format-changes/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jun 4 20:01:43 CDT 2004
Author: jlbec
Date: 2004-06-04 19:01:42 -0500 (Fri, 04 Jun 2004)
New Revision: 1013
Modified:
branches/format-changes/src/alloc.c
branches/format-changes/src/bitmap.c
branches/format-changes/src/dir.c
branches/format-changes/src/dlm.c
branches/format-changes/src/extmap.c
branches/format-changes/src/file.c
branches/format-changes/src/heartbeat.c
branches/format-changes/src/inode.c
branches/format-changes/src/journal.c
branches/format-changes/src/lockres.c
branches/format-changes/src/namei.c
branches/format-changes/src/nm.c
branches/format-changes/src/proc.c
branches/format-changes/src/super.c
branches/format-changes/src/symlink.c
branches/format-changes/src/sysfile.c
branches/format-changes/src/volcfg.c
Log:
o Merged revisions 985-992 from trunk.
(Unnecessary cast and assignment cleanup)
Modified: branches/format-changes/src/alloc.c
===================================================================
--- branches/format-changes/src/alloc.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/alloc.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -413,7 +413,7 @@
goto abort;
}
- bm_lock = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(globalbh); /* write */
+ bm_lock = OCFS_BH_GET_DATA_WRITE(globalbh);
bm_lock->u.bitinfo.used_bits = ocfs_count_bits(&osb->cluster_bitmap);
OCFS_BH_PUT_DATA(globalbh);
@@ -561,7 +561,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;
@@ -606,7 +606,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);
}
@@ -658,7 +658,7 @@
goto finally;
}
- extent_header = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_header_bh); /* write */
+ extent_header = OCFS_BH_GET_DATA_WRITE(extent_header_bh);
bh_locked = 1;
}
if (extent_header != NULL) {
@@ -707,7 +707,7 @@
goto finally;
}
- buff = OCFS_BH_GET_DATA_WRITE(header_bhs[i]); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(header_bhs[i]);
memset(buff, 0, osb->sect_size);
set_buffer_uptodate(header_bhs[i]);
OCFS_BH_PUT_DATA(header_bhs[i]);
@@ -734,7 +734,7 @@
/* Fill in all the headers and the leaf */
for (i = 0; i <= depth; i++) {
ocfs_extent_group *ext;
- ext = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(header_bhs[i]); /* write */
+ ext = OCFS_BH_GET_DATA_WRITE(header_bhs[i]);
ext->last_ext_ptr = lastExtPointer;
ext->up_hdr_node_ptr = upHeaderPtr;
@@ -743,7 +743,7 @@
ext->alloc_node = osb->node_num;
ext->extents[0].e_cpos = fe->i_clusters;
ext->extents[0].e_clusters = new_clusters;
- ext->this_ext = (__u64) (physicalOffset + (osb->sect_size * i));
+ ext->this_ext = physicalOffset + (osb->sect_size * i);
if (i != depth) {
/* fill in each header */
@@ -805,7 +805,7 @@
goto finally;
}
- extent_header = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ extent_header = OCFS_BH_GET_DATA_WRITE(bh);
if (!IS_VALID_EXTENT_HEADER(extent_header)) {
OCFS_BH_PUT_DATA(bh);
brelse(bh);
@@ -887,7 +887,7 @@
LOG_ERROR_STATUS (status = -ENOMEM);
goto finally;
}
- real_fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ real_fe = OCFS_BH_GET_DATA_READ(fe_bh);
memcpy(fe, real_fe, osb->sect_size);
OCFS_BH_PUT_DATA(fe_bh);
real_fe = NULL;
@@ -923,7 +923,7 @@
LOG_ERROR_STATUS(status);
goto finally;
}
- buf = OCFS_BH_GET_DATA_WRITE(bhs[i]); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(bhs[i]);
memset(buf, 0, osb->sb->s_blocksize);
set_buffer_uptodate(bhs[i]);
OCFS_BH_PUT_DATA(bhs[i]);
@@ -934,7 +934,7 @@
goto finally;
}
- OcfsExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bhs[0]); /* write */
+ OcfsExtent = OCFS_BH_GET_DATA_WRITE(bhs[0]);
/* Copy the File Entry information in to the newly allocated sector */
for (k = 0; k < OCFS_MAX_FILE_ENTRY_EXTENTS; k++) {
OcfsExtent->extents[k].e_cpos = fe->extents[k].e_cpos;
@@ -961,7 +961,7 @@
upHeaderPtr = fe->i_blkno << osb->sb->s_blocksize_bits;
for (i = 0; i < fe->i_tree_depth; i++) {
- ExtentHeader = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bhs[i]); /* write */
+ ExtentHeader = OCFS_BH_GET_DATA_WRITE(bhs[i]);
ExtentHeader->type = OCFS_EXTENT_HEADER;
ExtentHeader->granularity = (fe->i_tree_depth - 1) - i;
@@ -1000,7 +1000,7 @@
}
/* Update the Data Segment, which is the last one in our array */
- OcfsExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bhs[fe->i_tree_depth]); /* write */
+ OcfsExtent = OCFS_BH_GET_DATA_WRITE(bhs[fe->i_tree_depth]);
i = (fe->i_tree_depth) ? 0 : OCFS_MAX_FILE_ENTRY_EXTENTS;
@@ -1057,7 +1057,7 @@
goto finally;
}
- ext = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ ext = OCFS_BH_GET_DATA_WRITE(bh);
if (!IS_VALID_EXTENT_DATA(ext)) {
OCFS_BH_PUT_DATA(bh);
brelse(bh);
@@ -1099,7 +1099,7 @@
goto finally;
}
- ext = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ ext = OCFS_BH_GET_DATA_WRITE(bh);
ext->up_hdr_node_ptr = new_up_hdr_ptr;
OCFS_BH_PUT_DATA(bh);
@@ -1130,7 +1130,7 @@
finally:
if (fe) {
- real_fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ real_fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
memcpy(real_fe, fe, osb->sect_size);
OCFS_BH_PUT_DATA(fe_bh);
real_fe = NULL;
@@ -1161,7 +1161,7 @@
LOG_ENTRY_ARGS("(blkno=%llu, new_clusters=%u)\n", blkno, new_clusters);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
OCFS_ASSERT (fe);
if (!IS_VALID_FILE_ENTRY (fe)) {
@@ -1217,7 +1217,7 @@
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
}
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_bh); /* write */ /* but not if journalled */
+ extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
if (!IS_VALID_EXTENT_DATA(extent)) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -1235,7 +1235,7 @@
OCFS_BH_PUT_DATA(extent_bh);
ocfs_journal_access(handle, extent_bh,
OCFS_JOURNAL_ACCESS_WRITE);
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_bh); /* write */ /* journal_access */
+ extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
extent->extents[k].e_clusters += new_clusters;
status = 0;
@@ -1251,7 +1251,7 @@
OCFS_BH_PUT_DATA(extent_bh);
ocfs_journal_access(handle, extent_bh,
OCFS_JOURNAL_ACCESS_WRITE);
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_bh); /* write */ /* journal access */
+ extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
extent->extents[k].e_cpos = fe->i_clusters;
extent->extents[k].e_clusters = new_clusters;
@@ -1281,7 +1281,7 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- extent_header = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_header_bh); /* read */
+ extent_header = OCFS_BH_GET_DATA_READ(extent_header_bh);
if (!IS_VALID_EXTENT_HEADER(extent_header)) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -1329,7 +1329,7 @@
OCFS_BH_PUT_DATA(extent_bh);
ocfs_journal_access(handle, extent_bh,
OCFS_JOURNAL_ACCESS_WRITE);
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_bh); /* write */ /* journal access */
+ extent = OCFS_BH_GET_DATA_WRITE(extent_bh);
extent->next_data_ext = newExtentOff;
fe->last_ext_ptr = newExtentOff;
@@ -1376,7 +1376,7 @@
goto finally;
}
- extent_header = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_header_bh); /* write */
+ extent_header = OCFS_BH_GET_DATA_WRITE(extent_header_bh);
if (!IS_VALID_EXTENT_HEADER(extent_header)) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -1447,7 +1447,7 @@
* mapping run.So just adding this entry will be
* fine. */
if (fe == NULL)
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
Vbo = (u64)fe->i_clusters << osb->s_clustersize_bits;
Lbo = blkno << osb->sb->s_blocksize_bits;
@@ -1720,7 +1720,7 @@
goto bail;
}
- group = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(group_bh); /* write */
+ group = OCFS_BH_GET_DATA_WRITE(group_bh);
if (!IS_VALID_EXTENT_DATA(group) &&
!IS_VALID_EXTENT_HEADER(group)) {
@@ -1794,7 +1794,7 @@
LOG_ERROR_STATUS(status);
goto bail;
}
- extent_grp = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_grp_bh); /* write */ /* journal access */
+ extent_grp = OCFS_BH_GET_DATA_WRITE(extent_grp_bh);
for(i = (extent_grp->next_free_ext - 1); i>=0; i--) {
ext = &extent_grp->extents[i];
@@ -1870,7 +1870,7 @@
goto bail;
}
- extent_grp = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(extent_grp_bh); /* write */ /* journal access */
+ extent_grp = OCFS_BH_GET_DATA_WRITE(extent_grp_bh);
for(i = (extent_grp->next_free_ext - 1); i>=0; i--) {
ext = &extent_grp->extents[i];
@@ -1957,7 +1957,7 @@
goto bail;
}
- AllocExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bh_stack[tos]); /* write */ /* journal access */
+ AllocExtent = OCFS_BH_GET_DATA_WRITE(bh_stack[tos]);
if (!IS_VALID_EXTENT_DATA(AllocExtent) &&
!IS_VALID_EXTENT_HEADER(AllocExtent)) {
@@ -1981,7 +1981,7 @@
goto bail;
}
/* silly, but what to do? */
- AllocExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(bh_stack[tos]); /* read */
+ AllocExtent = OCFS_BH_GET_DATA_READ(bh_stack[tos]);
} else {
/* Alright, we know for sure that
* we're splitting in this guy. */
@@ -2079,7 +2079,7 @@
goto bail;
}
- AllocExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bh_stack[tos]); /* write */ /* journal access */
+ AllocExtent = OCFS_BH_GET_DATA_WRITE(bh_stack[tos]);
victim = AllocExtent->next_free_ext;
AllocExtent->next_free_ext++;
/* need to also update
@@ -2160,7 +2160,7 @@
goto bail;
}
- AllocExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bh_stack[tos]); /* write */ /* journal access */
+ AllocExtent = OCFS_BH_GET_DATA_WRITE(bh_stack[tos]);
victim = AllocExtent->next_free_ext;
AllocExtent->extents[victim].e_cpos = 0;
@@ -2316,7 +2316,7 @@
goto bail;
}
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_bh); /* read */
+ extent = OCFS_BH_GET_DATA_READ(extent_bh);
if (!IS_VALID_EXTENT_DATA(extent) &&
!IS_VALID_EXTENT_HEADER(extent)) {
@@ -2343,7 +2343,7 @@
LOG_ERROR_STATUS(status);
goto bail;
}
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_bh); /* read */
+ extent = OCFS_BH_GET_DATA_READ(extent_bh);
}
fe->last_ext_ptr = extent->this_ext;
@@ -2526,7 +2526,7 @@
goto finally;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY (fe)) {
LOG_ERROR_STATUS (status = -EINVAL);
@@ -2558,7 +2558,7 @@
goto finally;
}
- OcfsExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(ext_bh); /* read */
+ OcfsExtent = OCFS_BH_GET_DATA_READ(ext_bh);
while (1) {
status = ocfs_update_extent_map (osb, &OCFS_I(inode)->map, OcfsExtent,
&localVbo, &remainingLength, NONLOCAL_EXT);
@@ -2593,7 +2593,7 @@
LOG_ERROR_STATUS(status);
goto finally;
}
- OcfsExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(ext_bh); /* read */
+ OcfsExtent = OCFS_BH_GET_DATA_READ(ext_bh);
if (!IS_VALID_EXTENT_DATA(OcfsExtent)) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -2666,7 +2666,7 @@
goto finally;
}
- eh = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(ext_bh); /* read */
+ eh = OCFS_BH_GET_DATA_READ(ext_bh);
if (!IS_VALID_EXTENT_HEADER(eh)) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -2699,7 +2699,7 @@
goto finally;
}
- tmp = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(*data_extent_bh); /* read */
+ tmp = OCFS_BH_GET_DATA_READ(*data_extent_bh);
if (!IS_VALID_EXTENT_DATA(tmp)) {
LOG_ERROR_STATUS (status = -EINVAL);
OCFS_BH_PUT_DATA(*data_extent_bh);
@@ -2791,7 +2791,7 @@
goto leave;
}
- bm_lock = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ bm_lock = OCFS_BH_GET_DATA_WRITE(bh);
ClusterCount = (__u32) ((__u64) (file_size + (osb->vol_layout.cluster_size-1)) >>
osb->s_clustersize_bits);
@@ -2962,7 +2962,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;
@@ -3005,7 +3005,7 @@
/* Read in the bitmap file for the dir alloc and look for the
* required space, if found */
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
fileSize = fe->i_size;
allocSize = (u64)fe->i_clusters << osb->s_clustersize_bits;
OCFS_BH_PUT_DATA(bh);
@@ -3028,8 +3028,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 */
@@ -3074,7 +3073,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
/* we wrote it back out in ocfs_extend_system_file so
* we can trust the sizes here */
fileSize = fe->i_size;
@@ -3106,7 +3105,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);
@@ -3162,7 +3161,7 @@
LOG_ENTRY ();
offset = GET_INODE_FEOFF(inode);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (offset != (fe->i_blkno << osb->sb->s_blocksize_bits))
BUG();
OCFS_BH_PUT_DATA(fe_bh);
@@ -3170,7 +3169,7 @@
if (inode)
SET_BH_SEQNUM(inode, fe_bh);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (fe->i_tree_depth < 0) {
for (i = 0; i < fe->i_next_free_ext; i++) {
@@ -3194,7 +3193,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_bh); /* read */
+ extent = OCFS_BH_GET_DATA_READ(extent_bh);
if ((fe->i_tree_depth && (!IS_VALID_EXTENT_HEADER(extent))) && !IS_VALID_EXTENT_DATA(extent)) {
status = -EINVAL;
LOG_ERROR_STATUS(status);
@@ -3336,7 +3335,7 @@
if (!local_alloc_bh)
local_alloc_bh = osb->local_alloc_bh;
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_READ(local_alloc_bh); /* read */
+ alloc = OCFS_BH_GET_DATA_READ(local_alloc_bh);
if (alloc->alloc_size == 0) {
OCFS_BH_PUT_DATA(local_alloc_bh);
LOG_TRACE_STR("nothing to sync!");
@@ -3352,7 +3351,7 @@
}
}
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_READ(local_alloc_bh); /* read */
+ alloc = OCFS_BH_GET_DATA_READ(local_alloc_bh);
LOG_TRACE_ARGS("alloc->alloc_size = %u, COUNT = %u, num_used = %u\n",
alloc->alloc_size, ocfs_alloc_count_bits(alloc),
@@ -3404,7 +3403,7 @@
LOG_ENTRY();
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_READ(osb->local_alloc_bh); /* read */
+ alloc = OCFS_BH_GET_DATA_READ(osb->local_alloc_bh);
if (alloc->alloc_size != 0)
LOG_TRACE_STR("asking me to alloc a new window over a"
" non-empty one");
@@ -3427,7 +3426,7 @@
}
atomic_inc(&osb->alloc_stats.bitmap_data);
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh); /* write */
+ alloc = OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh);
alloc->bitmap_start = cluster_off;
alloc->alloc_size = cluster_count;
@@ -3544,7 +3543,7 @@
goto bail;
}
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh); /* write */ /* journal access */
+ alloc = OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh);
tryagain:
/* If we need to initialize a new window, do so now. */
if (alloc->alloc_size == 0) {
@@ -3579,7 +3578,7 @@
goto bail;
}
atomic_inc(&osb->alloc_stats.moves);
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh); /* write */ /* journal access */
+ alloc = OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh);
}
/* Alright, try to satisfy the request. */
@@ -3627,7 +3626,7 @@
goto bail;
}
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh); /* write */ /* journal access */
+ alloc = OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh);
ocfs_clear_local_alloc(alloc);
@@ -3641,7 +3640,7 @@
* alloc put back! */
ocfs_handle_set_sync(handle, 1);
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh); /* write */ /* journal access */
+ alloc = OCFS_BH_GET_DATA_WRITE(osb->local_alloc_bh);
goto tryagain;
}
@@ -3786,7 +3785,7 @@
goto bail;
}
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_READ(alloc_bh); /* read */
+ alloc = OCFS_BH_GET_DATA_READ(alloc_bh);
/* do a little verification. */
num_used = ocfs_alloc_count_bits(alloc);
@@ -3856,7 +3855,7 @@
f = NULL;
}
- alloc = (ocfs_local_alloc *) OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ alloc = OCFS_BH_GET_DATA_WRITE(bh);
ocfs_clear_local_alloc(alloc);
OCFS_BH_PUT_DATA(bh);
Modified: branches/format-changes/src/bitmap.c
===================================================================
--- branches/format-changes/src/bitmap.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/bitmap.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -192,7 +192,7 @@
globalsize, bitmap->validbits, sysonly);*/
/*LOG_TRACE_ARGS("before loop: c=%u, lastbh=%u, size=%u, "
"localstart=%u\n", c, lastbh, size, localstart);*/
- buffer = OCFS_BH_GET_DATA_READ(currbh); /* read */
+ buffer = OCFS_BH_GET_DATA_READ(currbh);
while ((bitoff = find_next_zero_bit(buffer, OCFS_BITS_IN_CHUNK,
localstart)) != -1) {
@@ -222,7 +222,7 @@
localstart = bitoff = 0;
c++;
currbh = bitmap->chunk[c];
- buffer = OCFS_BH_GET_DATA_READ(currbh); /* read */
+ buffer = OCFS_BH_GET_DATA_READ(currbh);
if (c == lastbh)
size = globalsize-(OCFS_BITS_IN_CHUNK*lastbh);
globaloff = c * OCFS_BITS_IN_CHUNK;
@@ -292,7 +292,7 @@
for (i = 0, validbytes = (size >= OCFS_BITMAP_CHUNK ? OCFS_BITMAP_CHUNK : size);
size > 0; size -= validbytes, i++) {
currbh = bitmap->chunk[i];
- buffer = OCFS_BH_GET_DATA_READ(currbh); /* read */
+ buffer = OCFS_BH_GET_DATA_READ(currbh);
for (j = 0; j < validbytes; j++) {
memcpy (&tmp, buffer, 1);
count += BITCOUNT (tmp);
@@ -339,7 +339,7 @@
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
while (num--) {
set_bit (local++, buff);
@@ -361,7 +361,7 @@
LOG_ERROR_STATUS(status);
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
}
}
@@ -408,7 +408,7 @@
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
while (num--) {
clear_bit (local, buff);
@@ -436,7 +436,7 @@
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
}
}
Modified: branches/format-changes/src/dir.c
===================================================================
--- branches/format-changes/src/dir.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/dir.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -90,7 +90,7 @@
(unsigned long long)bh->b_blocknr);
BUG();
}
- buf = OCFS_BH_GET_DATA_READ(bh); /* read */
+ buf = OCFS_BH_GET_DATA_READ(bh);
revalidate:
/* If the dir block has changed since the last call to
* readdir(2), then we might be pointing to an invalid
Modified: branches/format-changes/src/dlm.c
===================================================================
--- branches/format-changes/src/dlm.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/dlm.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -93,7 +93,6 @@
__u32 i;
ocfs_publish *pubsect = NULL;
__u64 largestseqno = 0;
- __u8 *p;
__u32 wait;
int publish_flag = 0;
struct buffer_head **bhs = NULL;
@@ -111,7 +110,7 @@
down_with_flag (&(osb->publish_lock), publish_flag);
/* Read the Publish Sector of all nodes */
- bhs = (struct buffer_head **)ocfs_malloc(numnodes * sizeof(struct buffer_head *));
+ bhs = ocfs_malloc(numnodes * sizeof(struct buffer_head *));
if (bhs == NULL) {
LOG_ERROR_STATUS (status = -ENOMEM);
goto finally;
@@ -124,8 +123,7 @@
}
for (i = 0; i < numnodes; i++) {
- p = OCFS_BH_GET_DATA_READ(bhs[i]); /* read */
- pubsect = (ocfs_publish *) p;
+ pubsect = OCFS_BH_GET_DATA_READ(bhs[i]);
if (pubsect->time == (__u64) 0 || pubsect->publ_seq_num <= largestseqno) {
OCFS_BH_PUT_DATA(bhs[i]);
continue;
@@ -155,8 +153,7 @@
/* Increment the largest sequence number by one & */
/* write it in its own Publish Sector and set the Dirty Bit */
- p = OCFS_BH_GET_DATA_WRITE(bhs[osb->node_num]); /* write */
- pubsect = (ocfs_publish *)p;
+ pubsect = OCFS_BH_GET_DATA_WRITE(bhs[osb->node_num]);
largestseqno++;
LOG_TRACE_ARGS ("largestseqno : %llu\n", largestseqno);
osb->publish_dirty = 1;
@@ -241,7 +238,7 @@
LOG_ERROR_STATUS (status = tmpstat);
goto finally;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
curr_master = DISK_LOCK(fe)->curr_master;
lock_level = DISK_LOCK(fe)->file_lock;
OCFS_BH_PUT_DATA(bh);
@@ -256,7 +253,7 @@
if (!IS_NODE_ALIVE (&osb->publ_map, curr_master, osb->max_nodes)) {
/* Reset the lock as not owned and return success?? */
/* This needs to be under some sort of cluster wide lock */
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK(fe)->curr_master = OCFS_INVALID_NODE_NUM;
DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
@@ -315,7 +312,7 @@
LOG_ERROR_STATUS (status = tmpstat);
goto finally;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
curr_master = DISK_LOCK(fe)->curr_master;
lock_level = DISK_LOCK(fe)->file_lock;
OCFS_BH_PUT_DATA(bh);
@@ -329,7 +326,7 @@
(!TEST_NODE_IN_RECOVERY(osb, curr_master))) {
/* Reset the lock as not owned and return success?? */
/* This needs to be under some sort of cluster wide lock, */
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK(fe)->curr_master = OCFS_INVALID_NODE_NUM;
DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
@@ -408,7 +405,7 @@
goto finally;
}
LOG_TRACE_ARGS("broke cache lock, setting to NO_LOCK\n");
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
lock_level = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
@@ -459,7 +456,6 @@
__u32 i;
__u32 numnodes;
ocfs_vote *vote;
- __u8 *p;
struct buffer_head **bhs = NULL;
LOG_ENTRY_ARGS ("(lockid=%llu, locktype=%u)\n", lock_id, lock_type);
@@ -468,7 +464,7 @@
/* Read the vote sectors of all the nodes */
length = numnodes * osb->sect_size;
- bhs = (struct buffer_head **)ocfs_malloc(numnodes * sizeof(struct buffer_head *));
+ bhs = ocfs_malloc(numnodes * sizeof(struct buffer_head *));
if (bhs == NULL) {
LOG_ERROR_STATUS (status = -ENOMEM);
goto finally;
@@ -485,8 +481,7 @@
int node_in_map = (IS_NODE_ALIVE (vote_map, i, numnodes));
status = 0;
- p = OCFS_BH_GET_DATA_READ(bhs[i]); /* read */
- vote = (ocfs_vote *) p;
+ vote = OCFS_BH_GET_DATA_READ(bhs[i]);
/* A node we were asking to vote is dead */
if (!node_alive) {
@@ -607,7 +602,7 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- pubsect = (ocfs_publish *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ pubsect = OCFS_BH_GET_DATA_WRITE(bh);
pubsect->dirty = 0;
pubsect->vote = 0;
@@ -670,13 +665,13 @@
}
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(*bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(*bh);
if (flags & DLOCK_FLAG_MASTER &&
DISK_LOCK(fe)->curr_master != lockres->master_node_num) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK(fe)->curr_master = lockres->master_node_num;
@@ -686,7 +681,7 @@
DISK_LOCK(fe)->file_lock != lockres->lock_type) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK(fe)->file_lock = lockres->lock_type;
@@ -704,7 +699,7 @@
if (!ocfs_node_map_is_equal(&disk_map, &lockres->oin_openmap)) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
ocfs_set_disk_lock_open_map(osb, DISK_LOCK(fe), &lockres->oin_openmap);
@@ -715,7 +710,7 @@
DISK_LOCK(fe)->dlock_seq_num != lockres->last_upd_seq_num) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK(fe)->dlock_seq_num = lockres->last_upd_seq_num;
@@ -892,7 +887,7 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- disklock = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(*b); /* read */
+ disklock = OCFS_BH_GET_DATA_READ(*b);
if (!IS_VALID_FILE_ENTRY(disklock))
BUG();
@@ -1106,7 +1101,7 @@
goto finito;
}
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(*b); /* read */
+ fe = OCFS_BH_GET_DATA_READ(*b);
#if 0
ocfs_node_map_init(osb, &openmap);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &openmap);
@@ -1193,7 +1188,7 @@
}
finally:
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(*b); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*b);
LOG_TRACE_ARGS("writing lock now... releasemaster: %s, level: %d, master: %d\n",
flags & FLAG_FILE_RELEASE_MASTER ? "yes" : "no",
@@ -1310,7 +1305,7 @@
static int ocfs_zap_child_buffers_func(struct dentry *dentry, void *data)
{
struct inode *inode = dentry->d_inode;
- ocfs_super *osb = (ocfs_super *)data;
+ ocfs_super *osb = data;
ocfs_inc_inode_seq(osb, inode, 0);
return 0;
@@ -1378,7 +1373,7 @@
need_to_zap_buffers = 1;
} else {
if (bh) {
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
/* may not need to rewrite the lock later if we already have a cachelock */
need_lock_write = (DISK_LOCK(fe)->curr_master != osb->node_num ||
DISK_LOCK(fe)->file_lock != OCFS_DLM_ENABLE_CACHE_LOCK);
@@ -1490,7 +1485,7 @@
/* pick up any change to the open map */
if (bh) {
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe),
&lockres->oin_openmap);
OCFS_BH_PUT_DATA(bh);
Modified: branches/format-changes/src/extmap.c
===================================================================
--- branches/format-changes/src/extmap.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/extmap.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -459,8 +459,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;
@@ -595,7 +594,7 @@
LOG_ENTRY ();
if (Flag == LOCAL_EXT) {
- fe = (ocfs2_dinode *)Buffer;
+ fe = Buffer;
OCFS_ASSERT(fe->i_tree_depth < 0);
@@ -614,7 +613,7 @@
} else {
__u64 localLength = 0;
- ext = (ocfs_extent_group *)Buffer;
+ ext = Buffer;
for (j = 0; j < ext->next_free_ext; j++) {
if ((__s64)((u64)(ext->extents[j].e_cpos + ext->extents[j].e_clusters) << osb->s_clustersize_bits) > (*localVbo)) {
Modified: branches/format-changes/src/file.c
===================================================================
--- branches/format-changes/src/file.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/file.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -99,7 +99,7 @@
if (handle)
local_handle = 0;
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
OCFS_BH_PUT_DATA(fe_bh);
status = -EINVAL;
@@ -428,7 +428,7 @@
LOG_ERROR_STATUS(ret = -ENOMEM);
goto leave;
}
- tmp = OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ tmp = OCFS_BH_GET_DATA_READ(fe_bh);
memcpy(fe, tmp, sizeof(ocfs2_dinode));
OCFS_BH_PUT_DATA(fe_bh);
tempoff = fe->i_blkno << osb->sb->s_blocksize_bits;
@@ -461,7 +461,7 @@
}
while (1) {
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_bh); /* read */
+ extent = OCFS_BH_GET_DATA_READ(extent_bh);
if (!IS_VALID_EXTENT_DATA (extent)) {
LOG_ERROR_STATUS(ret = -EFAIL);
@@ -582,7 +582,7 @@
goto leave;
}
- fileEntry = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fileEntry = OCFS_BH_GET_DATA_READ(bh);
if (!IS_VALID_FILE_ENTRY(fileEntry)) {
LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
@@ -627,7 +627,7 @@
goto leave;
}
- fileEntry = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fileEntry = OCFS_BH_GET_DATA_WRITE(bh);
fileEntry->i_mtime = OCFS_CURRENT_TIME;
@@ -954,7 +954,7 @@
goto leave;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
status = -EFAIL;
@@ -992,7 +992,7 @@
down(&OCFS_I(inode)->priv_sem);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
/* the file entry might have changed underneath us (while
* waiting on the lock). make sure the size is still a valid
@@ -1104,7 +1104,7 @@
goto leave;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
printk("fe->signature=%8s\n", fe->i_signature);
@@ -1137,7 +1137,7 @@
/* Grab a lock on the entry found if we have more than
* 1 extents and also make this node the master*/
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
/* now we always take an EXTEND lock */
lockId = fe->i_blkno << osb->sb->s_blocksize_bits;
@@ -1164,7 +1164,7 @@
goto leave;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */ /* journal access */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
if (file_size > (__s64)current_alloc) {
alloc_size = file_size - current_alloc;
@@ -1206,8 +1206,7 @@
actualDiskOffset =
(bitmapOffset << osb->s_clustersize_bits) +
osb->vol_layout.data_start_off;
- actualLength =
- (__u64) (numClustersAlloc << osb->s_clustersize_bits);
+ actualLength = numClustersAlloc << osb->s_clustersize_bits;
OCFS_BH_PUT_DATA(bh);
fe = NULL;
@@ -1243,7 +1242,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(bh); /* write */ /* journal access */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
/* update the total allocation size here */
fe->i_clusters +=
Modified: branches/format-changes/src/heartbeat.c
===================================================================
--- branches/format-changes/src/heartbeat.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/heartbeat.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -75,7 +75,7 @@
}
}
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_WRITE(*pub_bh); /* write */
+ publish = OCFS_BH_GET_DATA_WRITE(*pub_bh);
if ((publish->dirty) && (!osb->publish_dirty)) {
LOG_TRACE_STR(("NMThread reads the bit as dirty"));
publish->dirty = 0;
@@ -138,7 +138,7 @@
if (first_time) {
#if !defined(USERSPACE_TOOL)
/* Read the last comm_seq_num */
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bhs[osb->node_num]); /* read */
+ publish = OCFS_BH_GET_DATA_READ(bhs[osb->node_num]);
spin_lock (&OcfsGlobalCtxt.comm_seq_lock);
OcfsGlobalCtxt.comm_seq_num = publish->comm_seq_num + 10;
spin_unlock (&OcfsGlobalCtxt.comm_seq_lock);
@@ -146,7 +146,7 @@
#endif
/* Refresh local buffers */
for (i = 0; i < num_nodes; i++) {
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bhs[i]); /* read */
+ publish = OCFS_BH_GET_DATA_READ(bhs[i]);
node_map[i].time = publish->time;
if (publish->mounted && i != osb->node_num) {
printk("ocfs2: Adding %s (node %d) to "
@@ -165,7 +165,7 @@
}
for (i = 0; i < num_nodes; i++) {
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bhs[i]); /* read */
+ publish = OCFS_BH_GET_DATA_READ(bhs[i]);
/* Loop if slot is unused */
if (publish->time == (__u64) 0) {
Modified: branches/format-changes/src/inode.c
===================================================================
--- branches/format-changes/src/inode.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/inode.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -219,7 +219,7 @@
if (fe_bh) {
/* best case -- we can figure out what we need from
* the file entry! */
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh);
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
OCFS_BH_PUT_DATA(fe_bh);
LOG_ERROR_STATUS(-EINVAL);
@@ -313,7 +313,7 @@
if (opaque == NULL || inode == NULL)
goto bail;
- args = (ocfs_find_inode_args *) opaque;
+ args = opaque;
if (GET_INODE_FEOFF(inode) != args->feoff) {
LOG_ERROR_STATUS(-EINVAL);
@@ -346,7 +346,7 @@
if (!inode->u.generic_ip)
return -ENOMEM;
- i = (ocfs_inode_private *) inode->u.generic_ip;
+ i = inode->u.generic_ip;
memset(i, 0, sizeof(ocfs_inode_private));
i->flags = 0;
@@ -545,7 +545,7 @@
} else
bh = args->fe_bh;
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
if (S_ISCHR(fe->i_mode) || S_ISBLK(fe->i_mode))
inode->i_rdev = ocfs_decode_dev(le64_to_cpu(fe->u.i_rdev));
@@ -596,7 +596,7 @@
if (inode == NULL)
goto bail;
- args = (ocfs_find_inode_args *) opaque;
+ args = opaque;
if (args->ino == OCFS_ROOT_INODE_NUMBER) {
printk("find_actor: asked about root inode\n");
goto bail;
@@ -623,7 +623,7 @@
*/
static int ocfs_init_locked_inode(struct inode * inode, void * opaque)
{
- ocfs_find_inode_args *args = (ocfs_find_inode_args *) opaque;
+ ocfs_find_inode_args *args = opaque;
LOG_ENTRY_ARGS("inode = %p, opaque = %p\n", inode, opaque);
inode->i_ino = args->ino;
@@ -834,7 +834,7 @@
LOG_ERROR_STATUS (status);
goto bail;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
if (!IS_VALID_FILE_ENTRY (fe)) {
OCFS_BH_PUT_DATA(bh);
@@ -919,7 +919,7 @@
fatal = ocfs_journal_access(handle, bh,
OCFS_JOURNAL_ACCESS_CREATE);
if (!fatal) {
- char *buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ char *buf = OCFS_BH_GET_DATA_WRITE(bh);
memset(buf, 0, osb->sect_size);
set_buffer_uptodate(bh);
OCFS_BH_PUT_DATA(bh);
@@ -1197,7 +1197,7 @@
return -EIO;
}
- osb = (ocfs_super *) inode->i_sb->s_fs_info;
+ osb = inode->i_sb->s_fs_info;
blocksize_bits = inode->i_sb->s_blocksize_bits;
/* make sure we're up to date... */
if (OCFS_I(inode)->needs_verification) {
@@ -1797,7 +1797,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
/* Make sure that what we found is not a directory. */
if ((OCFS_I(inode)->oin_flags & OCFS_OIN_DIRECTORY))
Modified: branches/format-changes/src/journal.c
===================================================================
--- branches/format-changes/src/journal.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/journal.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -954,7 +954,7 @@
LOG_ERROR_STR("Could not get lock on journal!");
goto done;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
/* should be exactly eight megs. need to run tuneocfs otherwise. */
if (fe->i_size != OCFS_JOURNAL_DEFAULT_SIZE) {
@@ -1267,8 +1267,9 @@
static int __ocfs_recovery_thread(void *arg)
{
- ocfs_super *osb = ((struct ocfs_recover_arg *) arg)->osb;
- int node_num = ((struct ocfs_recover_arg *) arg)->node_num;
+ struct ocfs_recover_arg *recover_arg = arg;
+ ocfs_super *osb = recover_arg->osb;
+ int node_num = recover_arg->node_num;
int status = 0;
char proc[16];
@@ -1322,7 +1323,7 @@
LOG_TRACE_STR("starting recovery thread...");
- kernel_thread(__ocfs_recovery_thread, (void *) arg,
+ kernel_thread(__ocfs_recovery_thread, arg,
CLONE_VM | CLONE_FS | CLONE_FILES);
done:
@@ -1336,7 +1337,7 @@
{
int status = -1;
__u64 lock_id = 0;
- ocfs2_dinode *fe = NULL;
+ ocfs2_dinode *fe;
struct inode *inode = NULL;
journal_t *k_journal = NULL;
struct buffer_head *bh = NULL;
@@ -1412,11 +1413,10 @@
printk("ocfs2: Recovering node %d from device (%u,%u)\n", node_num,
MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev));
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
/* gonna need this later */
alloc_size = (u64)fe->i_clusters << osb->s_clustersize_bits;
OCFS_BH_PUT_DATA(bh);
- fe = NULL;
OCFS_I(inode)->alloc_size = alloc_size;
@@ -1537,7 +1537,7 @@
goto finally;
}
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_WRITE(publish_bh); /* write */
+ publish = OCFS_BH_GET_DATA_WRITE(publish_bh);
publish->dirty = 0;
publish->vote = 0;
@@ -1571,7 +1571,7 @@
int ocfs_commit_thread(void *arg)
{
int status = 0, misses = 0, finish = 0;
- ocfs_super *osb = (ocfs_super *)arg;
+ ocfs_super *osb = arg;
ocfs_commit_task *commit = osb->commit;
char name[16];
ocfs_journal *journal = osb->journal;
Modified: branches/format-changes/src/lockres.c
===================================================================
--- branches/format-changes/src/lockres.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/lockres.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -85,7 +85,7 @@
goto finally;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(*b); /* read */
+ fe = OCFS_BH_GET_DATA_READ(*b);
if (!IS_VALID_FILE_ENTRY(fe))
BUG();
Modified: branches/format-changes/src/namei.c
===================================================================
--- branches/format-changes/src/namei.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/namei.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -75,13 +75,13 @@
#endif
{
int status;
- ocfs2_dinode *fe = NULL;
+ ocfs2_dinode *fe;
struct buffer_head *fe_bh = NULL, *dirent_bh = NULL;
struct inode *inode = NULL;
struct super_block *sb = dir->i_sb;
struct dentry *ret;
ocfs_super *osb = OCFS_SB(sb);
- struct ocfs2_dir_entry *dirent = NULL;
+ struct ocfs2_dir_entry *dirent;
LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
dentry->d_name.len, dentry->d_name.name);
@@ -95,13 +95,12 @@
LOG_TRACE_ARGS("about to call find_files_on_disk with inode=%p\n",
dir);
- inode = NULL; // no inode yet
status = ocfs_find_files_on_disk (osb, dentry->d_name.name, dentry->d_name.len,
&fe_bh, dir, inode, 1, &dirent_bh, &dirent);
if (status < 0)
goto bail_add;
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
printk("ocfs2: invalid file entry! parent=%llu, name='%*s'\n",
GET_INODE_FEOFF(dir), dentry->d_name.len,
@@ -204,7 +203,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
ocfs_populate_inode (inode, fe, 1);
insert_inode_hash (inode);
@@ -236,7 +235,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_WRITE(newdirbh); /* write */
+ de = OCFS_BH_GET_DATA_WRITE(newdirbh);
de->inode = cpu_to_le64(file_off);
de->name_len = 1;
de->rec_len = cpu_to_le16(OCFS_DIR_REC_LEN(de->name_len));
@@ -263,7 +262,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(parent_fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(parent_fe_bh);
fe->i_links_count++;
OCFS_BH_PUT_DATA(parent_fe_bh);
fe = NULL;
@@ -362,7 +361,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(*new_fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*new_fe_bh);
memset (fe, 0, osb->sect_size);
inode->i_ino = ino_from_off(osb->sb, disk_off);
/*
@@ -614,7 +613,7 @@
* here if we set the modify bit on this buffer, but haven't
* journal_dirtied it yet. Otherwise, it'll stay modified even
* after the abort_trans. */
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
if (S_ISDIR (inode->i_mode))
fe->i_links_count = 0;
else
@@ -659,7 +658,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- dirfe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(parent_node_bh);
+ dirfe = OCFS_BH_GET_DATA_WRITE(parent_node_bh);
dirfe->i_links_count--;
OCFS_BH_PUT_DATA(parent_node_bh);
status = ocfs_journal_dirty(handle, fe_bh);
@@ -1036,7 +1035,7 @@
* away first */
if (new_de) {
/* TODO: change this block to the ext3-style orphan model */
- newfe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(newfe_bh); /* read */
+ newfe = OCFS_BH_GET_DATA_READ(newfe_bh);
if (S_ISDIR(newfe->i_mode))
newfe_flags = FLAG_DIR;
newfe_flags |= FLAG_FILE_DELETE;
@@ -1076,7 +1075,7 @@
* here if we set the modify bit on this buffer, but haven't
* journal_dirtied it yet. Otherwise, it'll stay modified even
* after the abort_trans. */
- newfe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(newfe_bh); /* write */
+ newfe = OCFS_BH_GET_DATA_WRITE(newfe_bh);
if (S_ISDIR (new_inode->i_mode) && !empty_dir(new_inode)) {
status = -ENOTEMPTY;
OCFS_BH_PUT_DATA(newfe_bh);
@@ -1130,7 +1129,7 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- OCFS_BH_GET_DATA_WRITE(new_de_bh); /* write */
+ OCFS_BH_GET_DATA_WRITE(new_de_bh);
new_de->inode = le64_to_cpu(GET_INODE_FEOFF(old_inode));
new_de->file_type = old_de->file_type;
new_dir->i_version++;
@@ -1175,7 +1174,7 @@
// BAD
goto bail;
}
- OCFS_BH_GET_DATA_WRITE(old_inode_de_bh); /* write */
+ OCFS_BH_GET_DATA_WRITE(old_inode_de_bh);
PARENT_INO(old_inode_de_bh->b_data) = le64_to_cpu(GET_INODE_FEOFF(new_dir));
OCFS_BH_PUT_DATA(old_inode_de_bh);
status = ocfs_journal_dirty(handle, old_inode_de_bh);
@@ -1335,7 +1334,7 @@
goto abort_trans;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
file_off = fe->i_blkno << osb->sb->s_blocksize_bits;
OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
@@ -1351,7 +1350,7 @@
}
inode->i_rdev = OCFS_NODEV;
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
ocfs_populate_inode (inode, fe, 1);
OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
@@ -1487,7 +1486,7 @@
/* create next block */
status = ocfs_journal_access(handle, bh, OCFS_JOURNAL_ACCESS_WRITE);
- buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(bh);
de = (struct ocfs2_dir_entry *) bh->b_data;
de->inode = 0;
de->rec_len = le16_to_cpu(sb->s_blocksize);
@@ -1498,7 +1497,7 @@
/* update the parent file entry file size */
status = ocfs_journal_access(handle, parent_fe_bh, OCFS_JOURNAL_ACCESS_WRITE);
- buf = OCFS_BH_GET_DATA_WRITE(parent_fe_bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(parent_fe_bh);
fe = (ocfs2_dinode *)buf;
fe->i_size = dir->i_size;
OCFS_BH_PUT_DATA(parent_fe_bh);
@@ -1506,14 +1505,14 @@
status = ocfs_journal_dirty(handle, parent_fe_bh);
} else {
/* move to next block */
- buf = OCFS_BH_GET_DATA_READ(bh); /* read */
+ buf = OCFS_BH_GET_DATA_READ(bh);
de = (struct ocfs2_dir_entry *) bh->b_data;
OCFS_BH_PUT_DATA(bh);
buf = NULL;
}
}
- buf = OCFS_BH_GET_DATA_READ(bh); /* read */
+ buf = OCFS_BH_GET_DATA_READ(bh);
if (!ocfs_check_dir_entry (dir, de, bh, offset)) {
retval = -ENOENT;
goto bail;
@@ -1527,7 +1526,7 @@
OCFS_BH_PUT_DATA(bh);
buf = NULL;
status = ocfs_journal_access(handle, bh, OCFS_JOURNAL_ACCESS_WRITE);
- buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(bh);
/* By now the buffer is marked for journaling */
offset += le16_to_cpu(de->rec_len);
if (le64_to_cpu(de->inode)) {
@@ -1566,7 +1565,6 @@
bail:
if (buf)
OCFS_BH_PUT_DATA(bh);
- buf = NULL;
brelse (bh);
return retval;
}
@@ -1583,7 +1581,7 @@
i = 0;
pde = NULL;
- de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ de = OCFS_BH_GET_DATA_READ(bh);
while (i < bh->b_size) {
if (!ocfs_check_dir_entry(dir, de, bh, i)) {
OCFS_BH_PUT_DATA(bh);
@@ -1597,7 +1595,7 @@
status = -EIO;
goto bail;
}
- OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ OCFS_BH_GET_DATA_WRITE(bh);
if (pde)
pde->rec_len = cpu_to_le16(le16_to_cpu(pde->rec_len) +
le16_to_cpu(de->rec_len));
@@ -1631,7 +1629,7 @@
int de_len;
int ret = 0;
- de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ de = OCFS_BH_GET_DATA_READ(bh);
dlimit = (char *)de + dir->i_sb->s_blocksize;
while ((char *) de < dlimit) {
/* this code is executed quadratically often */
@@ -1827,7 +1825,7 @@
if (err < 0)
goto bail;
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(bh);
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
fe->i_links_count++;
inode->i_nlink = fe->i_links_count;
inode->i_ctime = CURRENT_TIME;
Modified: branches/format-changes/src/nm.c
===================================================================
--- branches/format-changes/src/nm.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/nm.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -159,7 +159,7 @@
void ocfs_process_vote_worker(void *val)
{
- struct ocfs_sched_vote *sv = (struct ocfs_sched_vote *) val;
+ struct ocfs_sched_vote *sv = val;
ocfs_super *osb = NULL;
LOG_ENTRY();
@@ -193,7 +193,7 @@
LOG_ENTRY_ARGS("(vote_node = %d, bh = 0x%p)\n", vote_node, bh);
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ publish = OCFS_BH_GET_DATA_READ(bh);
if (osb->last_publ_seq_num[vote_node] == publish->publ_seq_num){
LOG_TRACE_ARGS("Already voted on node %d, seqnum (%llu)\n",
@@ -212,8 +212,8 @@
}
memset(sv, 0, sizeof(struct ocfs_sched_vote));
- ctxt = (ocfs_vote_request_ctxt *) &(sv->ctxt);
- ctxt->u.publish = (ocfs_publish *) &(sv->publish_sect);
+ ctxt = &sv->ctxt;
+ ctxt->u.publish = (ocfs_publish *) &sv->publish_sect;
memcpy(ctxt->u.publish, publish, osb->sect_size);
OCFS_BH_PUT_DATA(bh);
@@ -273,7 +273,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) arg;
+ osb = arg;
if (osb->obj_id.type != OCFS_TYPE_OSB)
goto eek;
@@ -320,7 +320,7 @@
}
bh = osb->cfg_bhs[OCFS_VOLCFG_NEWCFG_SECTORS + osb->node_num];
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bh);
+ publish = OCFS_BH_GET_DATA_READ(bh);
if ((osb->check_mounted) && (publish->mounted == 0)) {
printk("ocfs2: Heartbeat timed out, volume has been "
"recovered from another node!\n");
@@ -336,7 +336,7 @@
up (&(osb->publish_lock));
/* If another node was added to the config read and update the cfg */
- node_cfg_hdr = (ocfs_node_config_hdr *) OCFS_BH_GET_DATA_READ(osb->cfg_bhs[1]); /* read */
+ node_cfg_hdr = OCFS_BH_GET_DATA_READ(osb->cfg_bhs[1]);
num_nodes = node_cfg_hdr->num_nodes;
cfg_seq_num = node_cfg_hdr->cfg_seq_num;
OCFS_BH_PUT_DATA(osb->cfg_bhs[1]);
@@ -368,7 +368,7 @@
/* Check for the highest node looking for a vote, if anybody is looking */
for (i = 0, which = OCFS_VOLCFG_NEWCFG_SECTORS; i < num_nodes; i++, which++) {
ocfs_node_map vote_map;
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(osb->cfg_bhs[which]); /* read */
+ publish = OCFS_BH_GET_DATA_READ(osb->cfg_bhs[which]);
if (publish->time == (__u64) 0)
goto loop;
@@ -414,12 +414,12 @@
+ osb->node_num];
down(&(osb->publish_lock));
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ publish = OCFS_BH_GET_DATA_READ(bh);
voted = publish->vote;
OCFS_BH_PUT_DATA(bh);
if (voted) {
- publish = (ocfs_publish *) OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ publish = OCFS_BH_GET_DATA_WRITE(bh);
publish->vote = 0;
OCFS_BH_PUT_DATA(bh);
status = ocfs_write_bh(osb, bh, 0, NULL);
@@ -726,7 +726,7 @@
if (disk_vote) {
/* Zero out the vote, if any already set and hung */
- vote = (ocfs_vote *) OCFS_BH_GET_DATA_WRITE(vote_bh); /* write */
+ vote = OCFS_BH_GET_DATA_WRITE(vote_bh);
vote->node = (__u8)-1;
vote->type = 0;
OCFS_BH_PUT_DATA(vote_bh);
@@ -855,7 +855,7 @@
if (status < 0)
LOG_ERROR_STATUS (status);
if (status >= 0) {
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
DISK_LOCK(fe)->curr_master = node_num;
OCFS_BH_PUT_DATA(fe_bh);
status = ocfs_write_bh(osb, fe_bh, 0, inode);
@@ -975,12 +975,12 @@
break;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
is_dir = S_ISDIR(fe->i_mode);
is_locked = DISK_LOCK(fe)->file_lock > OCFS_DLM_NO_LOCK;
if (vote_type == CHANGE_MASTER) {
OCFS_BH_PUT_DATA(fe_bh);
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
if (inode && OCFS_I(inode)->open_hndl_cnt) {
ocfs_node_map_init(osb, &disk_map);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
@@ -998,7 +998,7 @@
if (is_locked || vote_type == CHANGE_MASTER) {
if (vote_type == RELEASE_CACHE) {
LOG_TRACE_STR("release cache vote, setting to NO_LOCK");
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
DISK_LOCK(fe)->file_lock = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(fe_bh);
}
@@ -1030,7 +1030,7 @@
LOG_ERROR_STATUS (status);
break;
}
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if ((fe->i_flags & OCFS2_NAME_DELETED_FL) ||
(!(fe->i_flags & OCFS2_VALID_FL))) {
@@ -1039,7 +1039,7 @@
} else {
ocfs_node_map_init(osb, &disk_map);
OCFS_BH_PUT_DATA(fe_bh);
- fe = (ocfs2_dinode *)OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
ocfs_get_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
ocfs_node_map_set_bit(&disk_map, node_num);
ocfs_set_disk_lock_open_map(osb, DISK_LOCK(fe), &disk_map);
@@ -1182,7 +1182,7 @@
}
if (disk_vote) {
- vote = (ocfs_vote *) OCFS_BH_GET_DATA_WRITE(vote_bh); /* write */
+ vote = OCFS_BH_GET_DATA_WRITE(vote_bh);
vote->lock_id = lock_id;
vote->vote_seq_num = seq_num;
vote->open_handle = open_handle;
Modified: branches/format-changes/src/proc.c
===================================================================
--- branches/format-changes/src/proc.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/proc.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -181,7 +181,7 @@
#define DLM_STATS_HDR "%-25s %10s %10s %10s %10s %10s %10s %10s\n"
#define DLM_STATS "%-25s %10d %10d %10d %10d %10d %10d %10d\n"
- osb = (ocfs_super *) data;
+ osb = data;
if (osb) {
nrq = &(osb->net_reqst_stats);
nrp = &(osb->net_reply_stats);
@@ -240,7 +240,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
#define ALLOC_STATS_HDR "%-25s %10u\n"
@@ -312,7 +312,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
sprintf (page, "%d\n", osb->node_num);
len = strlen (page);
@@ -477,7 +477,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
vol = &(osb->vol_layout);
pubmap = ocfs_malloc (100);
@@ -534,7 +534,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
len = snprintf (page, sizeof(osb->dev_str), "%s\n", osb->dev_str);
ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
@@ -559,7 +559,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
if (osb) {
down (&(osb->cfg_lock));
@@ -599,7 +599,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
d.func = ocfs_lookup_obj_for_proc;
d.ret = NULL;
Modified: branches/format-changes/src/super.c
===================================================================
--- branches/format-changes/src/super.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/super.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -693,7 +693,7 @@
LOG_ERROR_STR("failed to read bitmap data");
return -EIO;
}
- bm_lock = (ocfs2_dinode *)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;
@@ -815,8 +815,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);
@@ -951,7 +951,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));
@@ -1166,7 +1166,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;
@@ -1194,7 +1194,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;
@@ -1387,9 +1387,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;
@@ -1474,7 +1474,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);
/*
* FIXME: This really ought to be something exported by the
@@ -1644,7 +1644,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;
Modified: branches/format-changes/src/symlink.c
===================================================================
--- branches/format-changes/src/symlink.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/symlink.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -181,18 +181,18 @@
{
struct inode *inode = dentry->d_inode;
struct page *page = NULL;
- char *orig_link,*new_link;
- unsigned int len = 0,res=0;
+ char *orig_link, *new_link;
+ unsigned int len, res = 0;
orig_link = my_page_getlink(dentry, &page);
- len = ocfs_link_size(symlink_ops,orig_link,inode);
- new_link = (char *)kmalloc(len,GFP_KERNEL);
+ len = ocfs_link_size(symlink_ops, orig_link, inode);
+ new_link = kmalloc(len, GFP_KERNEL);
if (new_link == NULL) {
res = ENOMEM;
goto out;
}
- ocfs_link_expand(symlink_ops,new_link,orig_link,inode);
- res = vfs_follow_link(nd,new_link);
+ ocfs_link_expand(symlink_ops, new_link, orig_link, inode);
+ res = vfs_follow_link(nd, new_link);
out:
if (page) {
kunmap(page);
Modified: branches/format-changes/src/sysfile.c
===================================================================
--- branches/format-changes/src/sysfile.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/sysfile.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -137,7 +137,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY (fe)) {
LOG_ERROR_STATUS(status = -EINVAL);
@@ -157,7 +157,7 @@
LOG_ERROR_ARGS("numExts < 1 (= %d)\n", numExts);
goto leave;
}
- IoRuns = (ocfs_io_runs *) extentBuffer;
+ IoRuns = extentBuffer;
tmpoff = 0;
tmplen = 0;
j = 0;
@@ -218,7 +218,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY (fe)) {
LOG_ERROR_STATUS(status = -EINVAL);
@@ -234,7 +234,7 @@
OCFS_ASSERT (Buffer);
- IoRuns = (ocfs_io_runs *) Buffer;
+ IoRuns = Buffer;
/* Return the disk offset of first run . */
StartOffset = (IoRuns[0].disk_off);
@@ -275,7 +275,7 @@
goto leave;
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY (fe)) {
LOG_ERROR_ARGS("offset=%llu", offset);
@@ -283,7 +283,7 @@
goto leave;
}
- *Length = (__u64)fe->i_size;
+ *Length = fe->i_size;
*AllocSize = (u64)fe->i_clusters << osb->s_clustersize_bits;
leave:
@@ -329,7 +329,7 @@
goto leave;
}
}
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY (fe)) {
OCFS_BH_PUT_DATA(fe_bh);
@@ -365,8 +365,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 >> osb->sb->s_blocksize_bits,
@@ -381,7 +380,7 @@
/* I think at this point, this can be journalled too */
numbhs = (int)(actualLength >> osb->sb->s_blocksize_bits);
- bhs = ocfs_malloc(numbhs*sizeof(struct buffer_head *));
+ bhs = ocfs_malloc(numbhs * sizeof(struct buffer_head *));
if (!bhs) {
status = -ENOMEM;
LOG_ERROR_STATUS(status);
@@ -417,7 +416,7 @@
} else
actualLength = 0;
- fe = (ocfs2_dinode *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
fe->i_clusters +=
(u32)(actualLength >> osb->s_clustersize_bits);
fe->i_size = FileSize;
@@ -572,7 +571,7 @@
goto leave;
}
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_bh); /* read */
+ extent = OCFS_BH_GET_DATA_READ(extent_bh);
while (extent->type != OCFS_EXTENT_DATA) {
__u64 diskoffset;
@@ -605,7 +604,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- extent = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(extent_bh); /* read */
+ extent = OCFS_BH_GET_DATA_READ(extent_bh);
}
searchVbo = newOffset;
Modified: branches/format-changes/src/volcfg.c
===================================================================
--- branches/format-changes/src/volcfg.c 2004-06-04 23:26:27 UTC (rev 1012)
+++ branches/format-changes/src/volcfg.c 2004-06-05 00:01:42 UTC (rev 1013)
@@ -65,11 +65,11 @@
ocfs_super *osb;
__u64 offset;
ocfs_cfg_task *cfg_task;
- struct buffer_head *bh = NULL;
+ struct buffer_head *bh;
LOG_ENTRY ();
- cfg_task = (ocfs_cfg_task *) arg;
+ cfg_task = arg;
/* Obtain the volume for which we need to reiterate the lock */
osb = cfg_task->osb;
@@ -136,7 +136,7 @@
__u64 offset;
int i;
ocfs_node_config_info *disk_node = NULL;
- __u8 *p;
+ char *buf;
__u32 node_num;
__u32 sect_size;
__u32 size;
@@ -168,8 +168,7 @@
/* Check if preferred node num is available */
node_num = OCFS_INVALID_NODE_NUM;
if (pref_node_num >= 0 && pref_node_num < osb->max_nodes) {
- p = OCFS_BH_GET_DATA_READ(cfg_bhs[pref_node_num]); /* read */
- disk_node = (ocfs_node_config_info *)p;
+ disk_node = OCFS_BH_GET_DATA_READ(cfg_bhs[pref_node_num]);
if (disk_node->node_name[0] == '\0')
node_num = pref_node_num;
OCFS_BH_PUT_DATA(cfg_bhs[pref_node_num]);
@@ -178,8 +177,7 @@
/* if not, find the first available empty slot */
if (node_num == OCFS_INVALID_NODE_NUM) {
for (node_num = 0; node_num < osb->max_nodes; node_num++) {
- p = OCFS_BH_GET_DATA_READ(cfg_bhs[node_num]); /* read */
- disk_node = (ocfs_node_config_info *) p;
+ disk_node = OCFS_BH_GET_DATA_READ(cfg_bhs[node_num]);
if (disk_node->node_name[0] == '\0')
done = 1;
OCFS_BH_PUT_DATA(cfg_bhs[node_num]);
@@ -197,8 +195,8 @@
}
/* Copy the new nodecfg into the memory buffer */
- p = OCFS_BH_GET_DATA_WRITE(cfg_bhs[node_num]); /* write */
- memcpy (p, new_disk_node, sect_size);
+ buf = OCFS_BH_GET_DATA_WRITE(cfg_bhs[node_num]);
+ memcpy (buf, new_disk_node, sect_size);
OCFS_BH_PUT_DATA(cfg_bhs[node_num]);
/* Write the new node details on disk */
@@ -256,8 +254,8 @@
goto bail;
}
- hdr = (ocfs_node_config_hdr *) OCFS_BH_GET_DATA_WRITE(node_cfg_bhs[0]); /* write */
- hdr_copy = (ocfs_node_config_hdr *) OCFS_BH_GET_DATA_WRITE(node_cfg_bhs[1]); /* write */
+ hdr = OCFS_BH_GET_DATA_WRITE(node_cfg_bhs[0]);
+ hdr_copy = OCFS_BH_GET_DATA_WRITE(node_cfg_bhs[1]);
if (op == OCFS_VOLCFG_ADD)
hdr->num_nodes++;
@@ -314,12 +312,12 @@
static int ocfs_config_with_disk_lock (ocfs_super * osb, __u64 lock_off, __u8 * cfg_buf, __u32 node_num, ocfs_volcfg_op op)
{
int status = 0;
- char *lock_buf = NULL;
+ char *lock_buf;
int tried_acq = 0;
int break_lock = 0;
int bh_locked = 0;
ocfs_disk_lock *disk_lock;
- ocfs_cfg_task *cfg_task = NULL;
+ ocfs_cfg_task *cfg_task;
__u32 sect_size;
__u64 lock_node_num = OCFS_INVALID_NODE_NUM;
struct buffer_head *bh = NULL;
@@ -365,9 +363,8 @@
goto finito;
}
- lock_buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ lock_buf = OCFS_BH_GET_DATA_WRITE(bh);
bh_locked = 1;
-
disk_lock = (ocfs_disk_lock *) lock_buf;
lock_node_num = disk_lock->curr_master;
@@ -409,13 +406,12 @@
goto finito;
}
- lock_buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ lock_buf = OCFS_BH_GET_DATA_WRITE(bh);
/* If we tried to acquire and we still own it we take it... */
if ((tried_acq) && (memcmp (lock_buf, cfg_buf, sect_size) == 0)) {
memcpy (lock_buf, cfg_buf, sect_size);
OCFS_BH_PUT_DATA(bh);
- lock_buf = NULL;
/* Set timer to reiterate lock every few jiffies */
LOG_TRACE_ARGS ("Start Timer: %lu\n", jiffies);
@@ -506,7 +502,7 @@
goto finally;
}
- buffer = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buffer = OCFS_BH_GET_DATA_WRITE(bh);
/* reset lock... */
memset (buffer, 0, sect_size);
@@ -526,7 +522,7 @@
atomic_set (&osb->lock_event_woken, 0);
del_timer_sync(&osb->lock_timer);
- buffer = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buffer = OCFS_BH_GET_DATA_WRITE(bh);
/* reset lock... */
memset (buffer, 0, sect_size);
OCFS_BH_PUT_DATA(bh);
@@ -551,9 +547,9 @@
*/
static int ocfs_add_node_to_config (ocfs_super * osb)
{
- int status = 0;
+ int status;
ocfs_node_config_info *disk;
- void *buffer = NULL;
+ void *buffer;
__u64 offset;
__u32 sect_size = osb->sect_size;
@@ -566,7 +562,7 @@
}
memset (buffer, 0, sect_size);
- disk = (ocfs_node_config_info *) buffer;
+ disk = buffer;
/* populate the disknodecfg info from global context */
ocfs_volcfg_gblctxt_to_disknode (disk);
@@ -657,7 +653,7 @@
goto finally;
}
- buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(bh);
memcpy(buf, disk, osb->sect_size);
OCFS_BH_PUT_DATA(bh);
@@ -779,7 +775,7 @@
}
/* 1st block in buffer is the NodeCfgHdr */
- hdr = (ocfs_node_config_hdr *) OCFS_BH_GET_DATA_READ(cfg_bhs[0]); /* read */
+ hdr = OCFS_BH_GET_DATA_READ(cfg_bhs[0]);
if (strncmp (hdr->signature, NODE_CONFIG_HDR_SIGN,
NODE_CONFIG_SIGN_LEN)) {
@@ -809,8 +805,7 @@
for (i = 0; i < osb->max_nodes; i++) {//, p += sect_size) {
int which;
which = i + OCFS_VOLCFG_HDR_SECTORS;
- disk = (ocfs_node_config_info *)
- OCFS_BH_GET_DATA_READ(cfg_bhs[which]); /* read */
+ disk = OCFS_BH_GET_DATA_READ(cfg_bhs[which]);
if (disk->node_name[0] == '\0')
goto loop;
@@ -984,8 +979,8 @@
BARF_BARF_BARF *node;
ocfs_node_config_info *disk;
__u64 offset;
- __u8 *buffer = NULL;
- int status = 0;
+ __u8 *buffer;
+ int status;
LOG_ENTRY ();
@@ -995,7 +990,7 @@
goto bail;
}
- memset ((void *) buffer, 0, osb->sect_size);
+ memset (buffer, 0, osb->sect_size);
disk = (ocfs_node_config_info *) buffer;
/* populate the nodecfg info in disk from global context */
More information about the Ocfs2-commits
mailing list