[Ocfs2-commits] manish commits r989 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 2 20:36:45 CDT 2004
Author: manish
Date: 2004-06-02 19:36:43 -0500 (Wed, 02 Jun 2004)
New Revision: 989
Modified:
trunk/src/alloc.c
trunk/src/file.c
trunk/src/symlink.c
Log:
Remove unnecessary casts
Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c 2004-06-03 00:32:12 UTC (rev 988)
+++ trunk/src/alloc.c 2004-06-03 00:36:43 UTC (rev 989)
@@ -395,7 +395,7 @@
goto abort;
}
- bm_lock = (ocfs_file_entry *)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);
@@ -637,7 +637,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) {
@@ -684,7 +684,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]);
@@ -710,7 +710,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;
@@ -781,7 +781,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);
@@ -856,7 +856,7 @@
LOG_ERROR_STATUS (status = -ENOMEM);
goto finally;
}
- real_fe = (ocfs_file_entry *)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;
@@ -892,7 +892,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->sect_size);
set_buffer_uptodate(bhs[i]);
OCFS_BH_PUT_DATA(bhs[i]);
@@ -903,7 +903,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].file_off = fe->extents[k].file_off;
@@ -931,7 +931,7 @@
upHeaderPtr = fe->this_sector;
for (i = 0; i < fe->granularity; 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->granularity - 1) - i;
@@ -968,7 +968,7 @@
}
/* Update the Data Segment, which is the last one in our array */
- OcfsExtent = (ocfs_extent_group *) OCFS_BH_GET_DATA_WRITE(bhs[fe->granularity]); /* write */
+ OcfsExtent = OCFS_BH_GET_DATA_WRITE(bhs[fe->granularity]);
i = (fe->granularity) ? 0 : OCFS_MAX_FILE_ENTRY_EXTENTS;
@@ -1023,7 +1023,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);
@@ -1065,7 +1065,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);
@@ -1097,7 +1097,7 @@
finally:
if (fe) {
- real_fe = (ocfs_file_entry *)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;
@@ -1125,7 +1125,7 @@
LOG_ENTRY_ARGS("(actualDiskOffset=%llu, actualLength=%llu)\n", actualDiskOffset, actualLength);
- FileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ FileEntry = OCFS_BH_GET_DATA_WRITE(fe_bh);
OCFS_ASSERT (FileEntry);
if (!IS_VALID_FILE_ENTRY (FileEntry)) {
@@ -1179,7 +1179,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;
@@ -1196,7 +1196,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].num_bytes += actualLength;
status = 0;
@@ -1212,7 +1212,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].file_off = FileEntry->alloc_size;
extent->extents[k].num_bytes = actualLength;
@@ -1242,7 +1242,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;
@@ -1290,7 +1290,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;
FileEntry->last_ext_ptr = newExtentOff;
@@ -1337,7 +1337,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;
@@ -1405,7 +1405,7 @@
* mapping run.So just adding this entry will be
* fine. */
if (FileEntry == NULL)
- FileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ FileEntry = OCFS_BH_GET_DATA_READ(fe_bh);
Vbo = FileEntry->alloc_size;
Lbo = actualDiskOffset;
@@ -1667,7 +1667,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)) {
@@ -1738,7 +1738,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];
@@ -1811,7 +1811,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];
@@ -1892,7 +1892,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)) {
@@ -1915,7 +1915,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. */
@@ -2007,7 +2007,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
@@ -2087,7 +2087,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].file_off = 0;
@@ -2236,7 +2236,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)) {
@@ -2263,7 +2263,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;
@@ -2441,7 +2441,7 @@
goto finally;
}
- fe = (ocfs_file_entry *) 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);
@@ -2473,7 +2473,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);
@@ -2508,7 +2508,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;
@@ -2580,7 +2580,7 @@
goto finally;
}
- ExtentHeader = (ocfs_extent_group *) OCFS_BH_GET_DATA_READ(ext_bh); /* read */
+ ExtentHeader = OCFS_BH_GET_DATA_READ(ext_bh);
if (!IS_VALID_EXTENT_HEADER(ExtentHeader)) {
LOG_ERROR_STATUS (status = -EINVAL);
goto finally;
@@ -2614,7 +2614,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);
@@ -2706,7 +2706,7 @@
goto leave;
}
- bm_lock = (ocfs_file_entry *)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->cluster_size_bits);
@@ -2920,7 +2920,7 @@
/* Read in the bitmap file for the dir alloc and look for the
* required space, if found */
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
fileSize = fe->file_size;
allocSize = fe->alloc_size;
OCFS_BH_PUT_DATA(bh);
@@ -2989,7 +2989,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- fe = (ocfs_file_entry *) 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->file_size;
@@ -3075,7 +3075,7 @@
LOG_ENTRY ();
offset = GET_INODE_FEOFF(inode);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (offset != fe->this_sector)
BUG();
OCFS_BH_PUT_DATA(fe_bh);
@@ -3083,7 +3083,7 @@
if (inode)
SET_BH_SEQNUM(inode, fe_bh);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (fe->local_ext) {
for (i = 0; i < fe->next_free_ext; i++) {
@@ -3107,7 +3107,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->granularity && (!IS_VALID_EXTENT_HEADER(extent))) && !IS_VALID_EXTENT_DATA(extent)) {
status = -EINVAL;
LOG_ERROR_STATUS(status);
@@ -3249,7 +3249,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!");
@@ -3265,7 +3265,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),
@@ -3317,7 +3317,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");
@@ -3340,7 +3340,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;
@@ -3457,7 +3457,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) {
@@ -3492,7 +3492,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. */
@@ -3540,7 +3540,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);
@@ -3554,7 +3554,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;
}
@@ -3699,7 +3699,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);
@@ -3769,7 +3769,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: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-06-03 00:32:12 UTC (rev 988)
+++ trunk/src/file.c 2004-06-03 00:36:43 UTC (rev 989)
@@ -90,7 +90,7 @@
if (handle)
local_handle = 0;
- fe = (ocfs_file_entry *) 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;
@@ -421,7 +421,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(ocfs_file_entry));
OCFS_BH_PUT_DATA(fe_bh);
tempoff = fe->this_sector;
@@ -460,7 +460,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);
@@ -588,7 +588,7 @@
goto leave;
}
- fileEntry = (ocfs_file_entry *)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);
@@ -633,7 +633,7 @@
goto leave;
}
- fileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fileEntry = OCFS_BH_GET_DATA_WRITE(bh);
fileEntry->modify_time = OCFS_CURRENT_TIME;
@@ -962,7 +962,7 @@
goto leave;
}
- fe = (ocfs_file_entry *)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;
@@ -1000,7 +1000,7 @@
down(&OCFS_I(inode)->priv_sem);
- fe = (ocfs_file_entry *)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
@@ -1113,7 +1113,7 @@
goto leave;
}
- fileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fileEntry = OCFS_BH_GET_DATA_READ(bh);
if (!IS_VALID_FILE_ENTRY(fileEntry)) {
printk("fe->signature=%8s\n", fileEntry->signature);
@@ -1145,7 +1145,7 @@
/* Grab a lock on the entry found if we have more than
* 1 extents and also make this node the master*/
- fileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fileEntry = OCFS_BH_GET_DATA_READ(bh);
/* now we always take an EXTEND lock */
lockId = fileEntry->this_sector;
@@ -1172,7 +1172,7 @@
goto leave;
}
- fileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(bh); /* write */ /* journal access */
+ fileEntry = OCFS_BH_GET_DATA_WRITE(bh);
if (file_size > (__s64) fileEntry->alloc_size) {
allocSize = file_size - fileEntry->alloc_size;
@@ -1248,7 +1248,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- fileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(bh); /* write */ /* journal access */
+ fileEntry = OCFS_BH_GET_DATA_WRITE(bh);
/* update the total allocation size here */
fileEntry->alloc_size += actualLength;
Modified: trunk/src/symlink.c
===================================================================
--- trunk/src/symlink.c 2004-06-03 00:32:12 UTC (rev 988)
+++ trunk/src/symlink.c 2004-06-03 00:36:43 UTC (rev 989)
@@ -183,18 +183,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);
More information about the Ocfs2-commits
mailing list