[Ocfs2-commits] manish commits r987 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 2 20:30:37 CDT 2004
Author: manish
Date: 2004-06-02 19:30:35 -0500 (Wed, 02 Jun 2004)
New Revision: 987
Modified:
trunk/src/journal.c
trunk/src/nm.c
Log:
Remove unnecessary casts
Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c 2004-06-03 00:27:52 UTC (rev 986)
+++ trunk/src/journal.c 2004-06-03 00:30:35 UTC (rev 987)
@@ -948,7 +948,7 @@
LOG_ERROR_STR("Could not get lock on journal!");
goto done;
}
- fe = (ocfs_file_entry *) 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->file_size != OCFS_JOURNAL_DEFAULT_SIZE) {
@@ -1261,8 +1261,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];
@@ -1316,7 +1317,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:
@@ -1330,7 +1331,7 @@
{
int status = -1;
__u64 lock_id = 0;
- ocfs_file_entry *fe = NULL;
+ ocfs_file_entry *fe;
struct inode *inode = NULL;
journal_t *k_journal = NULL;
struct buffer_head *bh = NULL;
@@ -1406,11 +1407,10 @@
printk("ocfs2: Recovering node %d from device (%u,%u)\n", node_num,
MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev));
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
/* gonna need this later */
alloc_size = fe->alloc_size;
OCFS_BH_PUT_DATA(bh);
- fe = NULL;
OCFS_I(inode)->alloc_size = alloc_size;
@@ -1531,7 +1531,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;
@@ -1565,7 +1565,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: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c 2004-06-03 00:27:52 UTC (rev 986)
+++ trunk/src/nm.c 2004-06-03 00:30:35 UTC (rev 987)
@@ -151,7 +151,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();
@@ -185,7 +185,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",
@@ -204,8 +204,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);
@@ -266,7 +266,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) arg;
+ osb = arg;
if (osb->obj_id.type != OCFS_TYPE_OSB)
goto eek;
@@ -316,7 +316,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");
@@ -332,7 +332,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++) {
- 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;
@@ -412,12 +412,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);
@@ -736,7 +736,7 @@
if (disk_vote) {
/* Zero out the vote for everybody, 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);
for (i = 0; i < num_nodes; i++)
vote->vote[i] = 0;
OCFS_BH_PUT_DATA(vote_bh);
@@ -865,7 +865,7 @@
if (status < 0)
LOG_ERROR_STATUS (status);
if (status >= 0) {
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
DISK_LOCK_CURRENT_MASTER (fe) = node_num;
OCFS_BH_PUT_DATA(fe_bh);
status = ocfs_write_bh(osb, fe_bh, 0, inode);
@@ -985,12 +985,12 @@
break;
}
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
is_dir = fe->attribs & OCFS_ATTRIB_DIRECTORY;
is_locked = DISK_LOCK_FILE_LOCK (fe) > OCFS_DLM_NO_LOCK;
if (vote_type == CHANGE_MASTER) {
OCFS_BH_PUT_DATA(fe_bh);
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
if (inode && OCFS_I(inode)->open_hndl_cnt)
DISK_LOCK_OIN_MAP (fe) |= (1 << osb->node_num);
DISK_LOCK_CURRENT_MASTER (fe) = node_num;
@@ -1004,7 +1004,7 @@
if (is_locked || vote_type == CHANGE_MASTER) {
if (vote_type == RELEASE_CACHE) {
LOG_TRACE_STR("release cache vote, setting to NO_LOCK");
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_NO_LOCK;
OCFS_BH_PUT_DATA(fe_bh);
}
@@ -1036,7 +1036,7 @@
LOG_ERROR_STATUS (status);
break;
}
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if ((fe->sync_flags & OCFS_SYNC_FLAG_NAME_DELETED) ||
(!(fe->sync_flags & OCFS_SYNC_FLAG_VALID))) {
@@ -1046,7 +1046,7 @@
__u64 tmpmap;
OCFS_BH_PUT_DATA(fe_bh);
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
DISK_LOCK_OIN_MAP (fe) |= (1 << node_num);
tmpmap = DISK_LOCK_OIN_MAP (fe);
OCFS_BH_PUT_DATA(fe_bh);
@@ -1188,7 +1188,7 @@
}
if (disk_vote) {
- vote = (ocfs_vote *) OCFS_BH_GET_DATA_WRITE(vote_bh); /* write */
+ vote = OCFS_BH_GET_DATA_WRITE(vote_bh);
vote->dir_ent = lock_id;
vote->vote_seq_num = seq_num;
vote->open_handle = open_handle;
More information about the Ocfs2-commits
mailing list