[Ocfs2-commits] manish commits r878 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Apr 28 18:28:40 CDT 2004
Author: manish
Date: 2004-04-28 17:28:38 -0500 (Wed, 28 Apr 2004)
New Revision: 878
Modified:
trunk/src/inode.c
Log:
Make it build with 2.6 again, and some misc cleanup (removing unneeded casts
and variables)
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-04-28 22:28:04 UTC (rev 877)
+++ trunk/src/inode.c 2004-04-28 22:28:38 UTC (rev 878)
@@ -42,6 +42,7 @@
static int ocfs_writepage (struct page *page, struct writeback_control *wbc);
static int ocfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t offset, unsigned long nr_segs);
#else /* 2.4 kernel */
+static int ocfs_find_inode (struct inode *inode, unsigned long ino, void *opaque);
static int ocfs_bmap(struct address_space *mapping, long block);
static int ocfs_writepage (struct page *page);
static int ocfs_get_block2 (struct inode *inode, long iblock, long *oblock, int len);
@@ -238,13 +239,10 @@
* read_inode2 binds the actual inode to it. */
args.ino = ocfs_inode_hash_insert(osb, voteoff, feoff);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- inode = iget5_locked (sb, args->ino, ocfs_find_actor,
- ocfs_init_locked_inode, args);
+ inode = iget5_locked (sb, args.ino, ocfs_find_actor,
+ ocfs_init_locked_inode, &args);
#else
- inode =
- iget4 (sb, args.ino,
- (find_inode_t) ocfs_find_inode,
- (void *) (&args));
+ inode = iget4 (sb, args.ino, ocfs_find_inode, &args);
#endif
if (inode == NULL) {
LOG_ERROR_STR("access error");
@@ -270,7 +268,7 @@
if (inode->i_state & I_NEW) {
LOG_TRACE_STR("Inode was not in inode cache, reading "
"it.");
- ocfs_read_locked_inode(inode, args);
+ ocfs_read_locked_inode(inode, &args);
unlock_new_inode(inode);
}
#endif
@@ -295,7 +293,7 @@
*
* This is the iget4 helper function
*/
-int ocfs_find_inode (struct inode *inode, unsigned long ino, void *opaque)
+static int ocfs_find_inode (struct inode *inode, unsigned long ino, void *opaque)
{
ocfs_find_inode_args *args = NULL;
int ret = 0;
@@ -480,7 +478,7 @@
*/
void ocfs_read_inode2 (struct inode *inode, void *opaque)
{
- __ocfs_read_inode2(inode, (ocfs_find_inode_args *) opaque);
+ __ocfs_read_inode2(inode, opaque);
return;
} /* ocfs_read_inode2 */
@@ -710,9 +708,8 @@
*/
int ocfs_find_actor (struct inode *inode, void *opaque)
{
- ocfs_find_inode_args *args;
+ ocfs_find_inode_args *args = NULL;
int ret = 0;
- __u64 fileOff;
ocfs_file_entry *fe = NULL;
LOG_ENTRY_ARGS ("(0x%08x, %u, 0x%08x)\n", inode, inode->i_ino, opaque);
More information about the Ocfs2-commits
mailing list