[Ocfs2-tools-commits] jlbec commits r339 - trunk/fsck.ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-10-20 11:50:20 -0500 (Wed, 20 Oct 2004)
New Revision: 339

Modified:
   trunk/fsck.ocfs2/journal.c
Log:
fixed fsck for new extent_map changes

Modified: trunk/fsck.ocfs2/journal.c
===================================================================
--- trunk/fsck.ocfs2/journal.c	2004-10-20 16:46:15 UTC (rev 338)
+++ trunk/fsck.ocfs2/journal.c	2004-10-20 16:50:20 UTC (rev 339)
@@ -207,7 +207,7 @@
 	errcode_t err;
 	int contig;
 
-	err = ocfs2_extent_map_get_blocks(ji->ji_cinode->ci_map, blkoff,
+	err = ocfs2_extent_map_get_blocks(ji->ji_cinode, blkoff,
 					  1, blkno, &contig);
 	if (err) 
 		com_err(whoami, err, "while looking up logical block "
@@ -419,8 +419,7 @@
 		goto out;
 	}
 
-	err = ocfs2_extent_map_new(ost->ost_fs, ji->ji_cinode, 
-				   &ji->ji_cinode->ci_map);
+	err = ocfs2_extent_map_init(ost->ost_fs, ji->ji_cinode);
 	if (err) {
 		com_err(whoami, err, "while initializing extent map");
 		goto out;
@@ -504,7 +503,8 @@
 			jsb->s_sequence = ji->ji_final_seq + 1;
 
 			err = ocfs2_write_journal_superblock(ost->ost_fs,
-					ji->ji_jsb_block, ji->ji_jsb);
+					ji->ji_jsb_block,
+					(char *)ji->ji_jsb);
 			if (err)
 				ret = err;
 		}