[Ocfs2-commits] manish commits r990 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 2 20:40:58 CDT 2004
Author: manish
Date: 2004-06-02 19:40:56 -0500 (Wed, 02 Jun 2004)
New Revision: 990
Modified:
trunk/src/volcfg.c
Log:
Remove unnecessary casts, some unnecessary assignments
Modified: trunk/src/volcfg.c
===================================================================
--- trunk/src/volcfg.c 2004-06-03 00:36:43 UTC (rev 989)
+++ trunk/src/volcfg.c 2004-06-03 00:40:56 UTC (rev 990)
@@ -59,11 +59,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;
@@ -130,7 +130,7 @@
__u64 offset;
int i;
ocfs_node_config_info *disk_node = NULL;
- __u8 *p;
+ char *buf;
__u32 node_num;
__u32 sect_size;
__u32 size;
@@ -157,8 +157,7 @@
/* Check if preferred node num is available */
node_num = OCFS_INVALID_NODE_NUM;
if (pref_node_num >= 0 && pref_node_num < OCFS_MAXIMUM_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]);
@@ -167,8 +166,7 @@
/* if not, find the first available empty slot */
if (node_num == OCFS_INVALID_NODE_NUM) {
for (node_num = 0; node_num < OCFS_MAXIMUM_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]);
@@ -186,8 +184,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 */
@@ -243,8 +241,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++;
@@ -301,12 +299,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;
@@ -352,9 +350,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_CURRENT_MASTER(disk_lock);
@@ -396,13 +393,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);
@@ -493,7 +489,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);
@@ -513,7 +509,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);
@@ -538,9 +534,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;
@@ -553,7 +549,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);
@@ -644,7 +640,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);
@@ -766,7 +762,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)) {
@@ -796,8 +792,7 @@
for (i = 0; i < OCFS_MAXIMUM_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;
@@ -971,8 +966,8 @@
BARF_BARF_BARF *node;
ocfs_node_config_info *disk;
__u64 offset;
- __u8 *buffer = NULL;
- int status = 0;
+ __u8 *buffer;
+ int status;
LOG_ENTRY ();
@@ -982,7 +977,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