[Ocfs2-commits] manish commits r986 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 2 20:27:54 CDT 2004
Author: manish
Date: 2004-06-02 19:27:52 -0500 (Wed, 02 Jun 2004)
New Revision: 986
Modified:
trunk/src/heartbeat.c
trunk/src/inode.c
trunk/src/lockres.c
trunk/src/proc.c
Log:
Clean up unnecessary casts
Modified: trunk/src/heartbeat.c
===================================================================
--- trunk/src/heartbeat.c 2004-06-03 00:20:21 UTC (rev 985)
+++ trunk/src/heartbeat.c 2004-06-03 00:27:52 UTC (rev 986)
@@ -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;
@@ -136,7 +136,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);
@@ -144,7 +144,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->time[i] = publish->time;
if (publish->mounted && i != osb->node_num) {
printk("ocfs2: Adding %s (node %d) to "
@@ -163,7 +163,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: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-06-03 00:20:21 UTC (rev 985)
+++ trunk/src/inode.c 2004-06-03 00:27:52 UTC (rev 986)
@@ -200,7 +200,7 @@
if (fe_bh) {
/* best case -- we can figure out what we need from
* the file entry! */
- fe = (ocfs_file_entry *) 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);
@@ -294,7 +294,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);
@@ -327,7 +327,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;
@@ -523,7 +523,7 @@
} else
bh = args->fe_bh;
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(bh);
mode = fe->prot_bits;
@@ -599,7 +599,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;
@@ -626,7 +626,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;
@@ -844,7 +844,7 @@
LOG_ERROR_STATUS (status);
goto bail;
}
- fe = (ocfs_file_entry *)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);
@@ -928,7 +928,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);
@@ -1206,7 +1206,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) {
@@ -1806,7 +1806,7 @@
LOG_ERROR_STATUS (status);
goto leave;
}
- fe = (ocfs_file_entry *) 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: trunk/src/lockres.c
===================================================================
--- trunk/src/lockres.c 2004-06-03 00:20:21 UTC (rev 985)
+++ trunk/src/lockres.c 2004-06-03 00:27:52 UTC (rev 986)
@@ -79,7 +79,7 @@
goto finally;
}
- fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(*b); /* read */
+ fe = OCFS_BH_GET_DATA_READ(*b);
if (!IS_VALID_FILE_ENTRY(fe))
BUG();
Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c 2004-06-03 00:20:21 UTC (rev 985)
+++ trunk/src/proc.c 2004-06-03 00:27:52 UTC (rev 986)
@@ -267,7 +267,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);
@@ -326,7 +326,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
#define ALLOC_STATS_HDR "%-25s %10u\n"
@@ -398,7 +398,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
sprintf (page, "%d\n", osb->node_num);
len = strlen (page);
@@ -563,7 +563,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
vol = &(osb->vol_layout);
pubmap = ocfs_malloc (100);
@@ -620,7 +620,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);
@@ -646,7 +646,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
if (osb) {
down (&(osb->cfg_lock));
@@ -687,7 +687,7 @@
LOG_ENTRY ();
- osb = (ocfs_super *) data;
+ osb = data;
d.func = ocfs_lookup_obj_for_proc;
d.ret = NULL;
More information about the Ocfs2-commits
mailing list