[Ocfs2-commits] manish commits r988 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 2 20:32:14 CDT 2004
Author: manish
Date: 2004-06-02 19:32:12 -0500 (Wed, 02 Jun 2004)
New Revision: 988
Modified:
trunk/src/bitmap.c
trunk/src/dir.c
trunk/src/dlm.c
trunk/src/sysfile.c
Log:
Remove unecessary casts
Modified: trunk/src/bitmap.c
===================================================================
--- trunk/src/bitmap.c 2004-06-03 00:30:35 UTC (rev 987)
+++ trunk/src/bitmap.c 2004-06-03 00:32:12 UTC (rev 988)
@@ -191,7 +191,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) {
@@ -221,7 +221,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;
@@ -291,7 +291,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);
@@ -338,7 +338,7 @@
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
while (num--) {
set_bit (local++, buff);
@@ -360,7 +360,7 @@
LOG_ERROR_STATUS(status);
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
}
}
@@ -407,7 +407,7 @@
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
while (num--) {
clear_bit (local, buff);
@@ -435,7 +435,7 @@
goto bail;
}
- buff = OCFS_BH_GET_DATA_WRITE(currbh); /* write */
+ buff = OCFS_BH_GET_DATA_WRITE(currbh);
}
}
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-06-03 00:30:35 UTC (rev 987)
+++ trunk/src/dir.c 2004-06-03 00:32:12 UTC (rev 988)
@@ -84,7 +84,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: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c 2004-06-03 00:30:35 UTC (rev 987)
+++ trunk/src/dlm.c 2004-06-03 00:32:12 UTC (rev 988)
@@ -61,7 +61,6 @@
ocfs_publish *pubsect = NULL;
__u64 largestseqno = 0;
__u64 pubmap = 0;
- __u8 *p;
__u32 wait;
int publish_flag = 0;
struct buffer_head **bhs = NULL;
@@ -81,7 +80,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;
@@ -94,8 +93,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;
@@ -125,8 +123,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;
@@ -211,7 +208,7 @@
LOG_ERROR_STATUS (status = tmpstat);
goto finally;
}
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
curr_master = DISK_LOCK_CURRENT_MASTER (fe);
lock_level = DISK_LOCK_FILE_LOCK (fe);
OCFS_BH_PUT_DATA(bh);
@@ -226,7 +223,7 @@
if (!IS_NODE_ALIVE (osb->publ_map, curr_master, OCFS_MAXIMUM_NODES)) {
/* Reset the lock as not owned and return success?? */
/* This needs to be under some sort of cluster wide lock */
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK_CURRENT_MASTER (fe) = OCFS_INVALID_NODE_NUM;
DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
@@ -285,7 +282,7 @@
LOG_ERROR_STATUS (status = tmpstat);
goto finally;
}
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
curr_master = DISK_LOCK_CURRENT_MASTER (fe);
lock_level = DISK_LOCK_FILE_LOCK (fe);
is_dir = (fe->attribs & OCFS_ATTRIB_DIRECTORY);
@@ -300,7 +297,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 = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK_CURRENT_MASTER (fe) = OCFS_INVALID_NODE_NUM;
DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
@@ -379,7 +376,7 @@
goto finally;
}
LOG_TRACE_ARGS("broke cache lock, setting to NO_LOCK\n");
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_NO_LOCK;
lock_level = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(bh);
@@ -430,7 +427,6 @@
__u32 i;
__u32 numnodes;
ocfs_vote *vote;
- __u8 *p;
struct buffer_head **bhs = NULL;
LOG_ENTRY_ARGS ("(lockid=%llu, locktype=%u, votemap=0x%08x)\n",
@@ -441,7 +437,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;
@@ -458,8 +454,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) {
@@ -576,7 +571,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;
@@ -637,13 +632,13 @@
}
}
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(*bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(*bh);
if (flags & DLOCK_FLAG_MASTER &&
DISK_LOCK_CURRENT_MASTER (fe) != lockres->master_node_num) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK_CURRENT_MASTER (fe) = lockres->master_node_num;
@@ -653,7 +648,7 @@
DISK_LOCK_FILE_LOCK (fe) != lockres->lock_type) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK_FILE_LOCK (fe) = lockres->lock_type;
@@ -665,7 +660,7 @@
if (DISK_LOCK_OIN_MAP (fe) != lockres->oin_openmap) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK_OIN_MAP (fe) = lockres->oin_openmap;
@@ -676,7 +671,7 @@
DISK_LOCK_SEQNUM (fe) != lockres->last_upd_seq_num) {
if (!changed) {
OCFS_BH_PUT_DATA(*bh);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(*bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*bh);
}
changed = 1;
DISK_LOCK_SEQNUM (fe) = lockres->last_upd_seq_num;
@@ -857,7 +852,7 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- disklock = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(*b); /* read */
+ disklock = OCFS_BH_GET_DATA_READ(*b);
if (!IS_VALID_FILE_ENTRY(disklock))
BUG();
@@ -1060,7 +1055,7 @@
goto finito;
}
}
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(*b); /* read */
+ fe = OCFS_BH_GET_DATA_READ(*b);
oin_node_map = DISK_LOCK_OIN_MAP (fe);
curr_master = DISK_LOCK_CURRENT_MASTER (fe);
OCFS_BH_PUT_DATA(*b);
@@ -1154,7 +1149,7 @@
}
finally:
- fe = (ocfs_file_entry *)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",
@@ -1271,7 +1266,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;
@@ -1338,7 +1333,7 @@
need_to_zap_buffers = 1;
} else {
if (bh) {
- fe = (ocfs_file_entry *)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_CURRENT_MASTER (fe) != osb->node_num ||
DISK_LOCK_FILE_LOCK (fe) != OCFS_DLM_ENABLE_CACHE_LOCK);
@@ -1448,7 +1443,7 @@
/* pick up any change to the open map */
if (bh) {
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
lockres->oin_openmap = DISK_LOCK_OIN_MAP (fe);
OCFS_BH_PUT_DATA(bh);
}
Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c 2004-06-03 00:30:35 UTC (rev 987)
+++ trunk/src/sysfile.c 2004-06-03 00:32:12 UTC (rev 988)
@@ -70,7 +70,7 @@
goto leave;
}
- 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);
@@ -90,7 +90,7 @@
LOG_ERROR_ARGS("numExts < 1 (= %d)\n", numExts);
goto leave;
}
- IoRuns = (ocfs_io_runs *) extentBuffer;
+ IoRuns = extentBuffer;
tmpoff = 0;
tmplen = 0;
j = 0;
@@ -151,7 +151,7 @@
goto leave;
}
- 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);
@@ -167,7 +167,7 @@
OCFS_ASSERT (Buffer);
- IoRuns = (ocfs_io_runs *) Buffer;
+ IoRuns = Buffer;
/* Return the disk offset of first run . */
StartOffset = (IoRuns[0].disk_off);
@@ -208,7 +208,7 @@
goto leave;
}
- 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_ARGS("offset=%llu", offset);
@@ -262,7 +262,7 @@
goto leave;
}
}
- 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);
@@ -312,7 +312,7 @@
/* I think at this point, this can be journalled too */
numbhs = actualLength >> osb->sect_size_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);
@@ -348,7 +348,7 @@
} else
actualLength = 0;
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
fe->alloc_size += actualLength;
fe->file_size = FileSize;
@@ -504,7 +504,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;
@@ -535,7 +535,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;
More information about the Ocfs2-commits
mailing list